TizenRefApp-9333 Fix color of SearchField in MsgThread

Change-Id: I463ca287b6505b1f19650bf7fc25a1a92f9f5004
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/MsgThread/Controller/src/MsgThread.cpp b/src/MsgThread/Controller/src/MsgThread.cpp
index 7f9ba82738bd3342976994adb535a154a9e205b3..06556ad2daa5b2d5f520ada63d00336be2760eae 100644 (file)
--- a/src/MsgThread/Controller/src/MsgThread.cpp
+++ b/src/MsgThread/Controller/src/MsgThread.cpp
@@ -140,8 +140,6 @@ void MsgThread::setMode(Mode mode)
        if (m_Mode == mode)
                return;
 
-       NaviBar::NaviColorId colorId = mode == SearchMode ? NaviBar::NaviWhiteColorId : NaviBar::NaviBlueColorId;
-       getNaviBar().setColor(colorId);
        setNormalMode();
 
        switch (mode) {

diff --git a/src/MsgThread/View/src/MsgThreadSearchPanel.cpp b/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
index 868024234dc5abc41e54efe8d9abf4438287242b..b2016c1b900f4ffd91cc5e6e76ed665e584b4336 100644 (file)
--- a/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
+++ b/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
@@ -23,6 +23,11 @@
 
 using namespace Msg;
 
+#define COLOR_EDITFIELD_BG      250, 250, 250, 145
+#define COLOR_EDITFIELD_FG      250, 250, 250, 255
+#define COLOR_EDITFIELD_EFFECT    0,   0,   0,  77
+#define COLOR_EDITFIELD_CURSOR  180, 250, 250, 255
+
 MsgThreadSearchPanel::MsgThreadSearchPanel(Evas_Object *parent)
        : m_pEntry(nullptr)
        , m_pClearButton(nullptr)
@@ -43,11 +48,19 @@ MsgThreadSearchPanel::~MsgThreadSearchPanel()
 
 void MsgThreadSearchPanel::create(Evas_Object *parent)
 {
+       // Layout:
        setEo(elm_layout_add(parent));
-       elm_layout_theme_set(getEo(), "layout", "searchfield", "singleline");
-       expand();
+       elm_layout_theme_set(getEo(), "layout", "editfield", "singleline");
+       elm_object_color_class_color_set(getEo(), "underline", COLOR_EDITFIELD_FG);
+       elm_object_color_class_color_set(getEo(), "underline_focused", COLOR_EDITFIELD_FG);
 
+       // Entry:
        Evas_Object *entry = createEntry(getEo());
+
+       // Clear button:
+       Evas_Object *btn = createClearButton(getEo());
+       setContent(btn, "elm.swallow.button");
+
        setContent(entry, "elm.swallow.content");
 }
 
@@ -65,6 +78,11 @@ void MsgThreadSearchPanel::setListener(IMsgThreadSearchPanelListener *listener)
 Evas_Object *MsgThreadSearchPanel::createClearButton(Evas_Object *parent)
 {
        m_pClearButton = createButton(parent, "editfield_clear");
+       elm_object_focus_allow_set(m_pClearButton, false);
+       evas_object_smart_callback_add(m_pClearButton, "clicked", SMART_CALLBACK(MsgThreadSearchPanel, onClearButtonClicked), this);
+       elm_object_color_class_color_set(m_pClearButton, "icon", COLOR_EDITFIELD_FG);
+       elm_object_color_class_color_set(m_pClearButton, "icon_pressed", COLOR_EDITFIELD_FG);
+       elm_object_color_class_color_set(m_pClearButton, "effect", COLOR_EDITFIELD_EFFECT);
        return m_pClearButton;
 }
 
@@ -83,17 +101,18 @@ Evas_Object *MsgThreadSearchPanel::createEntry(Evas_Object *parent)
        elm_entry_input_panel_return_key_type_set(m_pEntry, ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH);
        elm_object_focus_allow_set(m_pEntry, EINA_TRUE);
        setText(m_pEntry, msgt("IDS_MSG_NPBODY_SEARCH"), "elm.guide");
+
+       elm_object_color_class_color_set(m_pEntry, "text_edit", COLOR_EDITFIELD_FG);
+       elm_object_color_class_color_set(m_pEntry, "text_edit_focused", COLOR_EDITFIELD_FG);
+       elm_object_color_class_color_set(m_pEntry, "text_guide", COLOR_EDITFIELD_BG);
+       elm_object_color_class_color_set(m_pEntry, "text_guide_focused", COLOR_EDITFIELD_BG);
+       elm_object_color_class_color_set(m_pEntry, "cursor", COLOR_EDITFIELD_CURSOR);
+
        evas_object_show(m_pEntry);
 
        evas_object_smart_callback_add(m_pEntry, "changed", SMART_CALLBACK(MsgThreadSearchPanel, onEntryChanged), this);;
        evas_object_event_callback_add(m_pEntry, EVAS_CALLBACK_KEY_DOWN, EVAS_EVENT_CALLBACK(MsgThreadSearchPanel, onKeyDown), this);
 
-       Evas_Object *btn = createClearButton(m_pEntry);
-       evas_object_show(btn);
-       elm_object_focus_allow_set(btn, false);
-       evas_object_smart_callback_add(btn, "clicked", SMART_CALLBACK(MsgThreadSearchPanel, onClearButtonClicked), this);
-       elm_object_part_content_set(getEo(), "elm.swallow.button", btn);
-
        return m_pEntry;
 }