TizenRefApp-6476 Style for NaviFrameItem set two times

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

diff --git a/src/Common/View/src/NaviFrameItem.cpp b/src/Common/View/src/NaviFrameItem.cpp
index 326c245..c132814 100644 (file)
--- a/src/Common/View/src/NaviFrameItem.cpp
+++ b/src/Common/View/src/NaviFrameItem.cpp
@@ -44,7 +44,6 @@ namespace
     const char *textColorWhiteTitleButtons = "#3db9cc";
     const char *textColorBlueTitleButtons = "#fafafa";
     const int textSizeTitleButtons = 32;
-    const char *naviTitleStyleEmpty = "empty";
 }
 
 NaviFrameItem::NaviFrameItem(NaviFrameView &owner)
@@ -259,7 +258,6 @@ void NaviFrameItem::NaviBar::on_button_clicked(void *data, Evas_Object *obj, voi
 void NaviFrameItem::onAttached(ViewItem &item)
 {
     ViewItem::onAttached(item);
-    elm_naviframe_item_style_set(getElmObjItem(), naviTitleStyleEmpty);
     setContent(*m_pNaviBar, naviTitlePart);
 }
 

diff --git a/src/Common/View/src/NaviFrameView.cpp b/src/Common/View/src/NaviFrameView.cpp
index d4ebd50..d09571a 100644 (file)
--- a/src/Common/View/src/NaviFrameView.cpp
+++ b/src/Common/View/src/NaviFrameView.cpp
@@ -22,6 +22,8 @@
 
 using namespace Msg;
 
+const char *naviTitleStyleEmpty = "empty";
+
 NaviFrameView::NaviFrameView(Evas_Object *parent)
     : View()
 {
@@ -90,7 +92,7 @@ bool NaviFrameView::isEmpty() const
 
 void NaviFrameView::push(NaviFrameItem &item, Evas_Object *content)
 {
-    Elm_Object_Item *it = elm_naviframe_item_push(getEo(), nullptr, nullptr, nullptr, content, nullptr);
+    Elm_Object_Item *it = elm_naviframe_item_push(getEo(), nullptr, nullptr, nullptr, content, naviTitleStyleEmpty);
     item.setElmObjItem(it);
 }
 
@@ -110,9 +112,9 @@ void NaviFrameView::insertToBottom(NaviFrameItem &item)
     Elm_Object_Item *insert = nullptr;
 
     if(before)
-        insert = elm_naviframe_item_insert_before(getEo(), before, nullptr, nullptr, nullptr, nullptr, nullptr);
+        insert = elm_naviframe_item_insert_before(getEo(), before, nullptr, nullptr, nullptr, nullptr, naviTitleStyleEmpty);
     else
-        insert = elm_naviframe_item_push(getEo(), nullptr, nullptr, nullptr, nullptr, nullptr);
+        insert = elm_naviframe_item_push(getEo(), nullptr, nullptr, nullptr, nullptr, naviTitleStyleEmpty);
 
     item.setElmObjItem(insert);
 }