Applied GUI V4.4 in EditDate & EditTime

Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>
Change-Id: Id233877742ade4e8a1cbbf46964c30e416414a0b
Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp
index 3ea786b..ab6b816 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDate.cpp
+++ b/src/ui/controls/FUiCtrl_EditDate.cpp
@@ -1010,7 +1010,7 @@ _EditDate::OnDrawFocus(void)
 {
        __pEditDatePresenter->SetFocusedElement();
        __pEditDatePresenter->SetFocusState(true);
-       __pEditDatePresenter->DrawFocus();
+       Invalidate();
        return;
 }
 

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index 51d66b5..fad470f 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -754,6 +754,7 @@ _EditDatePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        __textObject.RemoveAll();
        if (__isFocused && __focusId == boxId)
        {
+               GET_COLOR_CONFIG(EDITDATE::TEXT_HIGHLIGHTED, textColor);
                DrawFocus();
        }
 

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index dcc49ab..673d836 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -762,7 +762,7 @@ _EditTime::OnDrawFocus(void)
 {
        __pEditTimePresenter->SetFocusState(true);
        __pEditTimePresenter->SetFocusedElement();
-       __pEditTimePresenter->DrawFocus();
+       Invalidate();
        return;
 }
 

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index 6997229..c0b2c71 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -1065,6 +1065,15 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        }
        if (__isFocused && __focusId == boxId)
        {
+               if (boxId == DATETIME_ID_AMPM)
+               {
+                       GET_COLOR_CONFIG(EDITTIME::BUTTON_TEXT_HIGHLIGHTED, textColor);
+               }
+               else
+               {
+                       GET_COLOR_CONFIG(EDITTIME::TEXT_HIGHLIGHTED, textColor);
+               }
+
                DrawFocus();
        }
 

diff --git a/src/ui/inc/FUi_ResourceEditDateConfig.h b/src/ui/inc/FUi_ResourceEditDateConfig.h
index 4726f71..8aa937b 100644 (file)
--- a/src/ui/inc/FUi_ResourceEditDateConfig.h
+++ b/src/ui/inc/FUi_ResourceEditDateConfig.h
@@ -36,6 +36,7 @@ DECLARE_UI_CONFIG(EDITDATE);
        DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,9);
        DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,10);
        DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,11);
+       DECLARE_COLOR_CONFIG(TEXT_HIGHLIGHTED, 12);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,1);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,2);
        DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,3);

diff --git a/src/ui/inc/FUi_ResourceEditTimeConfig.h b/src/ui/inc/FUi_ResourceEditTimeConfig.h
index aa75f87..387474e 100644 (file)
--- a/src/ui/inc/FUi_ResourceEditTimeConfig.h
+++ b/src/ui/inc/FUi_ResourceEditTimeConfig.h
@@ -41,6 +41,8 @@ DECLARE_UI_CONFIG(EDITTIME);
        DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,14);
        DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,15);
        DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,16);
+       DECLARE_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, 17);
+       DECLARE_COLOR_CONFIG(TEXT_HIGHLIGHTED, 18);
        DECLARE_IMAGE_CONFIG(COLON_BG_NORMAL,1);
        DECLARE_IMAGE_CONFIG(BUTTON_BG_NORMAL,2);
        DECLARE_IMAGE_CONFIG(BUTTON_BG_PRESSED,3);

diff --git a/src/ui/resource/FUi_ResourceEditDateConfig.cpp b/src/ui/resource/FUi_ResourceEditDateConfig.cpp
index 1631500..d712a29 100644 (file)
--- a/src/ui/resource/FUi_ResourceEditDateConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditDateConfig.cpp
@@ -27,6 +27,7 @@ START_UI_CONFIG(EDITDATE);
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L1);
        ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L1P);
        ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1D);
+       ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1);
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5);
        //ADD_COLOR_CONFIG(DIVIDER_LEFT_HALF, $B0224);

diff --git a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
index cf55303..3accb39 100644 (file)
--- a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp
@@ -35,9 +35,11 @@ START_UI_CONFIG(EDITTIME);
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $F031L1);
        ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $F031L1P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $F031L1D);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $F031L1);
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L1);
        ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L1P);
        ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1D);
+       ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1);
        ADD_COLOR_CONFIG(TITLE_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5);