From fcdc15c8a9f5d6b4cfa4942b96aec088256471cd Mon Sep 17 00:00:00 2001 From: Chulheon Date: Wed, 4 Sep 2013 14:15:53 +0900 Subject: [PATCH] fixed bug (N_SE-50993,N_SE-50959) Change-Id: I37f2e83ac3758e1ed10c2210b3351e869ed87c61 --- src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp | 5 +++-- src/ui/controls/FUiCtrl_EditPresenter.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp index 25b2f44..e82a04a 100644 --- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp +++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp @@ -1916,8 +1916,8 @@ _EditCopyPasteManager::CreateCopyPastePopup(void) { if (editShowAreaAbsRect.y < panelAbsoulteBounds.y) { - editShowAreaAbsRect.y = panelAbsoulteBounds.y; editShowAreaAbsRect.height -= (panelAbsoulteBounds.y - editShowAreaAbsRect.y); + editShowAreaAbsRect.y = panelAbsoulteBounds.y; } } __editVisibleArea = CoordinateSystem::AlignToDevice(editShowAreaAbsRect); @@ -2053,7 +2053,8 @@ _EditCopyPasteManager::CreateCopyPastePopup(void) copyPastePoint.x = cursorRect.x; copyPastePoint.y = cursorRect.y; - if (__editVisibleArea.y > copyPastePoint.y || __editVisibleArea.y + __editVisibleArea.height < copyPastePoint.y) + if ((!_FloatCompare(__editVisibleArea.y, copyPastePoint.y) && __editVisibleArea.y > copyPastePoint.y) || + (!_FloatCompare(__editVisibleArea.y + __editVisibleArea.height, copyPastePoint.y) && __editVisibleArea.y + __editVisibleArea.height < copyPastePoint.y)) { return; } diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp index 3676854..dd45264 100644 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -982,6 +982,7 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu } if (__isCopyPasteManagerExist) { + UpdateComponentInformation(); __pCopyPasteManager->AdjustBounds(); } } @@ -3576,6 +3577,7 @@ _EditPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& touchI __pCopyPasteManager = new (std::nothrow) _EditCopyPasteManager(*__pEdit); SysTryReturn(NID_UI_CTRL, __pCopyPasteManager != null, false, E_SYSTEM, "Unable to create _EditCopyPasteManager instance."); __pCopyPasteManager->AddCopyPasteEventListener(*this); + UpdateComponentInformation(); __pCopyPasteManager->Show(); __isCopyPasteManagerExist = true; } @@ -10867,8 +10869,8 @@ _EditPresenter::ScrollPanelToCursorPosition(bool show) SysLog(NID_UI_CTRL, "------------------------ScrollPosition recalculation starts~!!!!--------------------------."); - FloatRectangle absPanelRect = __pParentPanel->GetAbsoluteBoundsF(); - FloatRectangle absEditRect = __pEdit->GetAbsoluteBoundsF(); + FloatRectangle absPanelRect = __pParentPanel->GetAbsoluteBoundsF(true); + FloatRectangle absEditRect = __pEdit->GetAbsoluteBoundsF(true); float scrollPosition = __pParentPanel->GetScrollPosition(); float upSideGap = 0.0f; -- 2.7.4