fixed bug (Focus Display, ContextMenu hiding issue)

Change-Id: Ic271fb3ac5a4e66d0a9262fc7489853d694e2ba4

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index b1db30e..00b18a9 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -1956,7 +1956,7 @@ _Edit::OnFocusLost(const _Control& source)
 {
        __internalFocus = false;
        _pEditPresenter->OnFocusLost();
-       Invalidate();
+       _Control::OnFocusLost(source);
 
        return true;
 }

diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index 9cf9fed..d0bedd0 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -1439,6 +1439,10 @@ _EditCopyPasteManager::CreateCopyPastePopup(void)
 
        else
        {
+               if (editShowAreaAbsRect.height <= 0)
+               {
+                       return;
+               }
                FloatRectangle cursorRect;
                int cursorPosition = GetCursorPosition();
                __pEdit->CalculateAbsoluteCursorBounds(cursorPosition, cursorRect);

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 2e4a809..0df25c1 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -4309,6 +4309,8 @@ _EditPresenter::SetText(const String& text)
 {
        result r = E_SUCCESS;
 
+       InitializeCopyPasteManager();
+
        int length = text.GetLength();
        if ((__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE) || (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER))
        {
@@ -5395,6 +5397,8 @@ _EditPresenter::OnFrameRestored(const _Frame& source)
 bool
 _EditPresenter::OnFocusLost(void)
 {
+       InitializeCopyPasteManager();
+
        if (__isAutoShrinkEnabled)
        {
                FloatRectangle intialWindowBounds = GetInitialBoundsF();