[Porting_2.4_UI_to_3.0] Tab Manager - Add left and right padding

    [Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-1877
    [Problem]      Bottom buttons didn't have proper margins.
    [Solution]     Create layout with margins and add them to BottomBar
                   in NaviframeWrapper.
    [Verify]       Open tab manager. Check if bottom buttons have proper
                   margins.

Change-Id: Ia4050730e762959ab3e97353de09569feed5b30a

diff --git a/core/BasicUI/NaviframeWrapper.cpp b/core/BasicUI/NaviframeWrapper.cpp
index cd11841751ddd800c0205e51ab7e3787cd43c116..af66bcafd78a9023df6d363b868b8463635414a2 100644 (file)
--- a/core/BasicUI/NaviframeWrapper.cpp
+++ b/core/BasicUI/NaviframeWrapper.cpp
@@ -91,7 +91,7 @@ void NaviframeWrapper::setVisibilityPrevButton(bool visible)
 void NaviframeWrapper::addButtonToBottomBar(std::string text, Evas_Smart_Cb callback, void *data)
 {
     if (!m_bottom_box)
-        createBottomBox();
+        createBottomBar();
     Evas_Object* button = elm_button_add(m_bottom_box);
     elm_object_style_set(button, "bottom");
     evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -117,7 +117,7 @@ void NaviframeWrapper::setEnableButtonInBottomBar(std::string text, bool enabled
 void NaviframeWrapper::setVisibilityBottomBar(bool visible)
 {
     if (!m_bottom_box)
-        createBottomBox();
+        createBottomBar();
     if (visible) {
         evas_object_show(m_bottom_box);
         elm_object_signal_emit(m_layout, "elm,state,toolbar,show", "elm");
@@ -127,14 +127,20 @@ void NaviframeWrapper::setVisibilityBottomBar(bool visible)
     }
 }
 
-void NaviframeWrapper::createBottomBox()
+void NaviframeWrapper::createBottomBar(Evas_Object* layout, std::string swallow_name)
 {
     m_bottom_box = elm_box_add(m_layout);
     elm_box_horizontal_set(m_bottom_box, EINA_TRUE);
     elm_box_padding_set(m_bottom_box, 32, 0);
     evas_object_size_hint_weight_set(m_bottom_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(m_bottom_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_object_part_content_set(m_layout, "toolbar", m_bottom_box);
+
+    if (layout) {
+        elm_object_part_content_set(m_layout, "toolbar", layout);
+        elm_object_part_content_set(layout, swallow_name.c_str(), m_bottom_box);
+    } else {
+        elm_object_part_content_set(m_layout, "toolbar", m_bottom_box);
+    }
 }
 
 

diff --git a/core/BasicUI/NaviframeWrapper.h b/core/BasicUI/NaviframeWrapper.h
index 3bf80a60f5f2a81b960ba584479a67578112952c..cc93b7aaf9fbbe65f7916f5c8284a40458d50e31 100644 (file)
--- a/core/BasicUI/NaviframeWrapper.h
+++ b/core/BasicUI/NaviframeWrapper.h
@@ -51,13 +51,13 @@ public:
     void addPrevButton(Evas_Smart_Cb callback, void* data);
     void setVisibilityPrevButton(bool visible);
 
+    void createBottomBar(Evas_Object* layout = nullptr,
+        std::string swallow_name = "elm.swallow.content");
     void addButtonToBottomBar(std::string text, Evas_Smart_Cb callback, void* data);
     void setEnableButtonInBottomBar(std::string text, bool enabled);
     void setVisibilityBottomBar(bool visible);
 
 protected:
-    void createBottomBox();
-
     Evas_Object *m_parent;
     Evas_Object *m_layout;
     Evas_Object *m_bottom_box;

diff --git a/services/TabUI/TabUI.cpp b/services/TabUI/TabUI.cpp
index 6aec362bb92e353ea82e80ec2eda494ca89dfe7e..9cd6a149cc5a7bce41a0f9c34b47201f8a1ba167 100644 (file)
--- a/services/TabUI/TabUI.cpp
+++ b/services/TabUI/TabUI.cpp
@@ -126,6 +126,13 @@ void TabUI::createTopContent()
 
 void TabUI::createBottomContent()
 {
+    Evas_Object *layout = elm_layout_add(m_naviframe->getLayout());
+    elm_layout_file_set(layout, m_edjFilePath.c_str(), "bottom_bar_with_margins");
+    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_show(layout);
+
+    m_naviframe->createBottomBar(layout);
     m_naviframe->setVisibilityBottomBar(true);
     //TODO: Missing translation
     m_naviframe->addButtonToBottomBar("Enable Secret", _enable_secret_clicked, this);

diff --git a/services/TabUI/edc/TabUI_mob.edc b/services/TabUI/edc/TabUI_mob.edc
index 301ad43a66250d7090de3d6f7640ee14e9114724..30363ca018412bcd11e7ba00b8a6f8d843e0c958 100755 (executable)
--- a/services/TabUI/edc/TabUI_mob.edc
+++ b/services/TabUI/edc/TabUI_mob.edc
@@ -3,6 +3,42 @@
 #define ON_OTHER_DEVICE 0
 
 collections { base_scale: 2.6;
+
+    group { name: "bottom_bar_with_margins";
+        parts {
+            rect { "top_left_content_spacer"; scale;
+                description { "default";
+                    min: 32 0;
+                    max: 32 0;
+                    align: 0 0;
+                    fixed: 1 1;
+                    visible: 0;
+                }
+            }
+            rect { "bottom_right_content_spacer"; scale;
+                description { "default";
+                    min: 32 0;
+                    max: 32 0;
+                    align: 1 1;
+                    fixed: 1 1;
+                    visible: 0;
+                }
+            }
+            swallow { "elm.swallow.content"; scale;
+                description { "default";
+                    rel1 {
+                        relative: 1 1;
+                        to: "top_left_content_spacer";
+                    }
+                    rel2 {
+                        relative: 0 0;
+                        to: "bottom_right_content_spacer";
+                    }
+                }
+            }
+        }
+    }
+
     group { name: "naviframe_content";
         parts {
             rect { "content_top_left_spacer"; scale;