fixed bug(Selected text color is not clearly visible due to lighter background in...

Change-Id: I1de6be601fb7fbb42e41dd7c5078b9cfa3c02a9e

diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index abb1ad7..fe31dec 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -830,7 +830,8 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
 {
        FloatDimension screenSize;
        _ControlManager* pControlManager = _ControlManager::GetInstance();
-       _ControlOrientation orientation = GetOrientation();
+       _Edit* pEdit = __pCopyPasteManager->GetEdit();
+       _ControlOrientation orientation = pEdit->GetOrientation();
        FloatRectangle rect = GetBoundsF();
        
        if (orientation == _CONTROL_ORIENTATION_PORTRAIT)

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index b02391d..bfcc9a5 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -225,6 +225,7 @@ _EditPresenter::_EditPresenter(void)
        , __textBlockMoving(false)
        , __clipboardConnected(false)
        , __updateInitialBounds(true)
+       , __blockTextColor(Color(0, 0, 0))
 {
 }
 
@@ -1695,6 +1696,10 @@ _EditPresenter::DrawText(Canvas& canvas)
        EditStatus editStatus = GetCurrentStatus();
 
        __pTextObject->SetForegroundColor(__pEdit->GetTextColor(editStatus), 0, __pTextObject->GetTextLength());
+       if (__isTextBlocked)
+       {
+               __pTextObject->SetForegroundColor(__blockTextColor, __blockStartPos, __cursorPos - __blockStartPos);
+       }
 
        if (__isTextBlocked == true && editStatus == EDIT_STATUS_HIGHLIGHTED)
        {
@@ -1803,6 +1808,10 @@ _EditPresenter::DrawTextForEntireFontSetting(Canvas& canvas)
                __pTextObject->GetRange(startRange, lengthRange);
                __pTextObject->SetRange(0, GetTextLength());
                __pTextObject->SetForegroundColor(__pEdit->GetTextColor(editStatus), 0, __pTextObject->GetTextLength());
+               if (__isTextBlocked)
+               {
+                       __pTextObject->SetForegroundColor(__blockTextColor, __blockStartPos, __cursorPos - __blockStartPos);
+               }
 
                if (IsBlocked() == true && editStatus == EDIT_STATUS_HIGHLIGHTED)
                {

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index 2f2235a..e9fe237 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -574,6 +574,7 @@ private:
        bool __textBlockMoving;
        bool __clipboardConnected;
        bool __updateInitialBounds;
+       Tizen::Graphics::Color __blockTextColor;
 }; // _EditPresenter
 
 }}} // Tizen::Ui::Controls