fixed display error and remove useless API (ScrollPanelToExposeRegion)

Change-Id: I74490f4a1d11337d8250c2c6350a9857142873fd

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index bb134eb..8290791 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -520,8 +520,7 @@ _Edit::InitializeColorInformation(void)
        for (int i = 0; i < EDIT_LINK_TYPE_MAX; i++)
        {
                EditCutLinkType type = (EditCutLinkType) i;
-               //GET_COLOR_CONFIG(EDIT::CUT_LINK_TEXT_NORMAL, __cutlinkColor[type].cutlinkFgColor);
-               __cutlinkColor[type].cutlinkFgColor = Color::GetColor(COLOR_ID_BLUE);
+               GET_COLOR_CONFIG(EDIT::CUT_LINK_TEXT_NORMAL, __cutlinkColor[type].cutlinkFgColor);
                GET_COLOR_CONFIG(EDIT::CUT_LINK_BG_NORMAL, __cutlinkColor[type].cutlinkBgColor);
        }
 

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 12816e3..b013ccb 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -252,7 +252,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                        ChangeLayoutInternal(__pEdit->GetOrientation());
                        AdjustParentPanelHeight(false);
 
-                       ScrollPanelToExposedRegion(true);
                        ScrollPanelToCursorPosition();
 
                        if (__isCopyPasteManagerExist)
@@ -429,7 +428,6 @@ _EditPresenter::OnInputConnectionPanelBoundsChanged(InputConnection& source, con
 
        if (__pParentForm)
        {
-               ScrollPanelToExposedRegion(true);
                ScrollPanelToCursorPosition();
                __pParentForm->Draw();
        }
@@ -818,7 +816,6 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu
 
                                if (__pParentForm)
                                {
-                                       ScrollPanelToExposedRegion(true);
                                        ScrollPanelToCursorPosition();
                                        __pParentForm->SetClipboardShowState(true);
                                        __pParentForm->Draw();
@@ -843,7 +840,6 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu
 
                        if (__pParentForm)
                        {
-                               ScrollPanelToExposedRegion(true);
                                ScrollPanelToCursorPosition();
                                __pParentForm->SetClipboardShowState(true);
                                __pParentForm->Draw();
@@ -880,7 +876,6 @@ _EditPresenter::OnClipboardPopupBoundsChanged(Tizen::Graphics::Dimension& clipbo
                                if (__pParentForm)
                                {
                                        __pParentForm->Draw();
-                                       ScrollPanelToExposedRegion(true);
                                        ScrollPanelToCursorPosition();
                                }
 
@@ -894,7 +889,6 @@ _EditPresenter::OnClipboardPopupBoundsChanged(Tizen::Graphics::Dimension& clipbo
                        if (__pParentForm)
                        {
                                __pParentForm->Draw();
-                               ScrollPanelToExposedRegion(true);
                                ScrollPanelToCursorPosition();
                        }
 
@@ -6381,7 +6375,6 @@ _EditPresenter::ShowKeypad(bool focus)
                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_OPENED);
                }
 
-               ScrollPanelToExposedRegion(true);
                ScrollPanelToCursorPosition();
        }
        else
@@ -6425,7 +6418,6 @@ _EditPresenter::ShowKeypad(bool focus)
                {
                        ChangeLayoutInternal(__pEdit->GetOrientation());
                        //ChangeLayoutInternal(__pEdit->GetOrientation(), false);
-                       ScrollPanelToExposedRegion(true);
                        ScrollPanelToCursorPosition();
                        if (__pParentForm)
                        {
@@ -6436,7 +6428,6 @@ _EditPresenter::ShowKeypad(bool focus)
                else
                {
                        __initialParentHeight = 0.0f;
-                       ScrollPanelToExposedRegion(true);
                        ScrollPanelToCursorPosition();
                }
 
@@ -6480,6 +6471,7 @@ _EditPresenter::ChangeLayout(_ControlOrientation orientation)
                        __initialParentHeight = 0.0f;
                        ChangeLayoutInternal(orientation);
                        AdjustParentPanelHeight(false);
+                       ScrollPanelToCursorPosition();
                }
                else // if clipboard exists, boundsChanged callback will delivered after rotate callback
                {
@@ -6489,6 +6481,7 @@ _EditPresenter::ChangeLayout(_ControlOrientation orientation)
                        {
                                ChangeLayoutInternal(orientation);
                                AdjustParentPanelHeight(false);
+                               ScrollPanelToCursorPosition();
                        }
                }
        }
@@ -9359,22 +9352,6 @@ _EditPresenter::ScrollPanelToTop(bool show)
 }
 
 void
-_EditPresenter::ScrollPanelToExposedRegion(bool show)
-{
-       if (!__pParentPanel)
-               return;
-
-       __pParentPanel->ScrollToControl(*__pEdit);
-
-       if (show)
-       {
-               __pParentPanel->Invalidate();
-       }
-
-       return;
-}
-
-void
 _EditPresenter::ScrollPanelToCursorPosition(bool show)
 {
        if (!__pParentPanel)

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index e9fe237..71ad96a 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -436,7 +436,6 @@ private:
        result ShowFullscreenKeypad(void);
        InputPanelAction ConvertKeypadAction(CoreKeypadAction keypadAction);
        void ScrollPanelToTop(bool show);
-       void ScrollPanelToExposedRegion(bool show);
        bool IsUnsupportedChracterExist(const KeypadStyle keypadStyle, const Tizen::Base::String& text);
        result Dispose(void);
 

diff --git a/src/ui/resource/FUi_ResourceEditConfig.cpp b/src/ui/resource/FUi_ResourceEditConfig.cpp
index 1e39d93..99ef3ee 100755 (executable)
--- a/src/ui/resource/FUi_ResourceEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditConfig.cpp
@@ -38,7 +38,7 @@ START_UI_CONFIG(EDIT);
        ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $F051);
        ADD_COLOR_CONFIG(CLEAR_ICON_NORMAL, $F041i);
        ADD_COLOR_CONFIG(CLEAR_ICON_PRESSED, $B042);
-       ADD_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, $F011L1);
+       ADD_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(CUT_LINK_BG_NORMAL, $B0217);
        ADD_COLOR_CONFIG(CURSOR_NORMAL, $F052);