Fixed: style of navi-title

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

diff --git a/res/edje/msg_title.edc b/res/edje/msg_title.edc
index 1e627c085b204e83e5e558b9f6b50d2d2dd44807..92031123a1419f3522f63c4249c74ee814620ae8 100644 (file)
--- a/res/edje/msg_title.edc
+++ b/res/edje/msg_title.edc
@@ -1,4 +1,5 @@
 #include "colors_define.inl"
+#include "macros.inl"
 
 #define TITLE_HEIGHT 110
 #define PADDING_SIZE_DEFAULT 32
@@ -11,7 +12,7 @@
 
 collections {
 
-   base_scale: 2.6;
+   BASE_SCALE;
 
    styles {
       style {
@@ -20,7 +21,7 @@ collections {
       }
       style {
          name: "title_font_light";
-         base: "font=Samsung Condensed:style=Latin font_size=50 align=center color=#52cde0 ellipsis=1.0";
+         base: "font=Samsung Condensed:style=Latin font_size=50 align=center color=#2e8b99 ellipsis=1.0";
       }
    }
 

diff --git a/src/Common/View/inc/NaviFrameItem.h b/src/Common/View/inc/NaviFrameItem.h
index 31b0e80f61f162bb8c9756f8ebd407e0540806d8..d0540a6bc0707c9f6f06d75d74ed8069c77e49e2 100644 (file)
--- a/src/Common/View/inc/NaviFrameItem.h
+++ b/src/Common/View/inc/NaviFrameItem.h
@@ -120,6 +120,7 @@ namespace Msg
             void showCenterButtonPart(bool value);
             void showPrevButtonPart(bool value);
             void showDownButtonPart(bool value);
+            int getTextSize(NaviFrameItem::NaviButtonId id) const;
 
             static void on_button_clicked(void *data, Evas_Object *obj, void *event_info);
 

diff --git a/src/Common/View/src/NaviFrameItem.cpp b/src/Common/View/src/NaviFrameItem.cpp
index c13281401b334ede875c22f0fc94238f7ffc8cdc..e61a8a016acbe0b80eb0e6c903c52e00973f9a31 100644 (file)
--- a/src/Common/View/src/NaviFrameItem.cpp
+++ b/src/Common/View/src/NaviFrameItem.cpp
@@ -41,9 +41,10 @@ namespace
     const char *cancelButtonDefTextId = "IDS_MSG_ACBUTTON_CANCEL_ABB";
     const char *okButtonDefTextId = "IDS_MSG_ACBUTTON_DONE_ABB";
     const char *buttonTypeKey = "BTkey";
-    const char *textColorWhiteTitleButtons = "#3db9cc";
+    const char *textColorWhiteTitleButtons = "#2e8b99";
     const char *textColorBlueTitleButtons = "#fafafa";
-    const int textSizeTitleButtons = 32;
+    const int textSizeCenterButton = 50;
+    const int textSizeLateralButton = 35;
 }
 
 NaviFrameItem::NaviFrameItem(NaviFrameView &owner)
@@ -248,6 +249,11 @@ void NaviFrameItem::NaviBar::showDownButtonPart(bool value)
         emitSignal("right,clear", "*");
 }
 
+int NaviFrameItem::NaviBar::getTextSize(NaviFrameItem::NaviButtonId id) const
+{
+    return id == NaviFrameItem::NaviCenterButtonId ? textSizeCenterButton : textSizeLateralButton;
+}
+
 void NaviFrameItem::NaviBar::on_button_clicked(void *data, Evas_Object *obj, void *event_info)
 {
     NaviFrameItem::NaviBar *naviBar = static_cast<NaviFrameItem::NaviBar*>(data);
@@ -298,7 +304,7 @@ void NaviFrameItem::NaviBar::setButtonText(NaviButtonId id, const std::string &t
         default:
             break;
     }
-    style.setSize(textSizeTitleButtons);
+    style.setSize(getTextSize(id));
     elm_object_text_set(m_ButtonList[id].button, TextDecorator::make(text, style).c_str());
 }
 
@@ -345,7 +351,7 @@ void NaviFrameItem::NaviBar::setButtonColor(NaviButtonId id, NaviColorId titleCo
             default:
                 break;
         }
-        style.setSize(textSizeTitleButtons);
+        style.setSize(getTextSize(id));
         const char *buttonText = elm_object_text_get(m_ButtonList[id].button);
         if (buttonText != nullptr)
         {