From 63311051fd8c6b3307775c62cdd95a8de9290bfd Mon Sep 17 00:00:00 2001 From: Seongjun Yim Date: Mon, 1 Apr 2013 18:14:30 +0900 Subject: [PATCH] fix bug OnWebPageBlockSelected() Change-Id: I89ebfc071bbb9c819faf96f84ff1e028d11a5dab Signed-off-by: Seongjun Yim --- src/controls/FWebCtrl_WebImpl.cpp | 50 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp index 395ec43..1280cb0 100755 --- a/src/controls/FWebCtrl_WebImpl.cpp +++ b/src/controls/FWebCtrl_WebImpl.cpp @@ -1332,20 +1332,23 @@ FireWebPageBlockSelectedEvent(_WebImpl* pImpl) pImpl->GetBlockRange(*startPoint.get(), *endPoint.get()); - std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED)); - SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); + if ((endPoint->x != 0) && (endPoint->y != 0)) + { + std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED)); + SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); - r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - startPoint.release(); + r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + startPoint.release(); - r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - endPoint.release(); + r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + endPoint.release(); - r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - pEventArg.release(); + r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + pEventArg.release(); + } return E_SUCCESS; } @@ -1363,20 +1366,23 @@ FireWebPageBlockSelectedEventF(_WebImpl* pImpl) pImpl->GetBlockRange(*startPoint.get(), *endPoint.get()); - std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED_FLOAT)); - SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); + if ((endPoint->x != 0.0f) && (endPoint->y != 0.0f)) + { + std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED_FLOAT)); + SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed."); - r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - startPoint.release(); + r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + startPoint.release(); - r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - endPoint.release(); + r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + endPoint.release(); - r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get()); - SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - pEventArg.release(); + r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get()); + SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + pEventArg.release(); + } return E_SUCCESS; } -- 2.7.4