[Review comments fixed]

[elc_naviframe]: 1. Text center alignment fix[based on GUI v0.6]
2. if only more button is added the button shifts right.

Change-Id: I0c88b7244a68550021656b9c52091d4f913e4693

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index dedefe9..906b9fe 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -35,6 +35,11 @@
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
          public cbar_bg = 0;     //Controlbar BG Show call count
+         public left_btn_visible = 0; //whether left btn is shown
+         public icon_visible = 0; //whether icon is shown
+         public right_btn_visible = 0; //whether right btn is shown
+         public more_btn_visible = 0; //whether more btn is shown
+         public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
       }
       parts {
          part { name: "base";
@@ -189,20 +194,6 @@
                visible: 0;
             }
          }
-         part { name: "padding_after_left_btn";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "elm.swallow.left_btn"; }
-               rel2 { relative: 1.0 1.0; to: "elm.swallow.left_btn"; }
-               visible: 0;
-            }
-         }
          part { name: "padding_after_right_btn";
             type: RECT;
             mouse_events: 0;
@@ -230,25 +221,11 @@
                rel2 { relative: 0.0 1.0; to: "elm.swallow.right_btn"; }
                visible: 0;
             }
-            description { state: "more_button" 0.0;
+            description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
                min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
             }
          }
-         part { name: "padding_before_more_btn";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
-               fixed: 1 0;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.swallow.more_btn"; }
-               rel2 { relative: 0.0 1.0; to: "elm.swallow.more_btn"; }
-               visible: 0;
-            }
-         }
          part { name: "padding_before_text";
             type: RECT;
             scale: 1;
@@ -269,14 +246,22 @@
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 0.0 0.0;
                rel1 { relative: 0.0 0.0; to: "title_bg"; }
                rel2 { relative: 0.0 1.0; to: "title_bg"; }
                visible: 0;
             }
-            description { state: "icon_visible" 0.0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TEXT_PADDING_INC 0;
+            }
+            description { state: "icon" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
+            }
+            description { state: "icon_left_button" 0.0;
                inherit: "default" 0.0;
                min: NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 0;
             }
@@ -287,14 +272,18 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_INC 0;
+               min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
                fixed: 1 0;
                align: 1.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_bg"; }
                rel2 { relative: 1.0 1.0; to: "title_bg"; }
                visible: 0;
             }
-            description { state: "more_button" 0.0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TEXT_PADDING_INC 0;
+            }
+            description { state: "right_and_more_button" 0.0;
                inherit: "default" 0.0;
                min: NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 0;
             }
@@ -346,11 +335,9 @@
                min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
-               rel1.to: "padding_before_left_btn";
-               rel1.relative: 1 0;
-               rel2.to: "padding_before_left_btn";
-               rel2.relative: 1 1;
+               align: 0 0.5;
+               rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
+               rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
             }
          }
          part { name: "elm.swallow.right_btn";
@@ -358,14 +345,17 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
+               min: 0 0;
+               align: 1 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
                min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
-               align: 1.0 0.5;
-               rel1.to: "padding_after_right_btn";
-               rel1.relative: 0 0;
-               rel2.to: "padding_after_right_btn";
-               rel2.relative: 0 1;
             }
          }
          part { name: "elm.swallow.more_btn";
@@ -373,14 +363,17 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1 0.5;
+               rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
                min: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
                fixed: 1 1;
-               align: 1.0 0.5;
-               rel1.to: "padding_before_right_btn";
-               rel1.relative: 0 0;
-               rel2.to: "padding_before_right_btn";
-               rel2.relative: 0 1;
             }
          }
          part { name: "optionheader_arrow";
@@ -579,31 +572,171 @@
                emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
+         program { name: "left_btn_show";
+            signal: "elm,state,elm.swallow.left_btn,show";
+            source: "elm";
+            script {
+               set_int(left_btn_visible, 1);
+               if (get_int(icon_visible) == 1)
+                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else
+                 set_state(PART:"padding_center_text1", "visible", 0.0);
+               if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
+                  set_state(PART:"padding_center_text2", "right_and_more_button", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+            }
+         }
+         program { name: "left_btn_hide";
+            signal: "elm,state,elm.swallow.left_btn,hide";
+            source: "elm";
+            script {
+               set_int(left_btn_visible, 0);
+               if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
+                  set_state(PART:"padding_center_text2", "default", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else if (get_int(large_padded_center_align) == 1)
+                  set_state(PART:"padding_center_text1", "visible", 0.0);
+               else if (get_int(icon_visible) == 1)
+                  set_state(PART:"padding_center_text1", "icon", 0.0);
+               else
+                  set_state(PART:"padding_center_text1", "default", 0.0);
+            }
+         }
+         program { name: "right_btn_show";
+            signal: "elm,state,elm.swallow.right_btn,show";
+            source: "elm";
+            script {
+               set_int(right_btn_visible, 1);
+               set_state(PART:"elm.swallow.right_btn", "visible", 0.0);
+               if (get_int(more_btn_visible) == 1) {
+                  set_state(PART:"padding_center_text2", "right_and_more_button", 0.0);
+                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+                                                    (get_int(large_padded_center_align) == 1)))
+                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+                 set_state(PART:"padding_center_text1", "visible", 0.0);
+               else if (get_int(icon_visible) == 1)
+                 set_state(PART:"padding_center_text1", "icon", 0.0);
+               else
+                 set_state(PART:"padding_center_text1", "default", 0.0);
+            }
+         }
+         program { name: "right_btn_hide";
+            signal: "elm,state,elm.swallow.right_btn,hide";
+            source: "elm";
+            script {
+               set_int(right_btn_visible, 0);
+               set_state(PART:"elm.swallow.right_btn", "default", 0.0);
+               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+                  set_state(PART:"padding_center_text2", "default", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else if (get_int(large_padded_center_align) == 1)
+                  set_state(PART:"padding_center_text1", "visible", 0.0);
+               else if (get_int(icon_visible) == 1)
+                  set_state(PART:"padding_center_text1", "icon", 0.0);
+               else
+                  set_state(PART:"padding_center_text1", "default", 0.0);
+            }
+         }
          program { name: "more_btn_show";
             signal: "elm,state,elm.swallow.more_btn,show";
             source: "elm";
-            action: STATE_SET "more_button" 0.0;
-            target: "padding_center_text2";
-            target: "padding_before_right_btn";
+            script {
+               set_state(PART:"elm.swallow.more_btn", "visible", 0.0);
+               set_int(more_btn_visible, 1);
+               if (get_int(right_btn_visible) == 1) {
+                  set_state(PART:"padding_center_text2", "right_and_more_button", 0.0);
+                  set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+                                                    (get_int(large_padded_center_align) == 1)))
+                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+                 set_state(PART:"padding_center_text1", "visible", 0.0);
+               else if (get_int(icon_visible) == 1)
+                 set_state(PART:"padding_center_text1", "icon", 0.0);
+               else
+                 set_state(PART:"padding_center_text1", "default", 0.0);
+            }
          }
          program { name: "more_btn_hide";
             signal: "elm,state,elm.swallow.more_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "padding_center_text2";
-            target: "padding_before_right_btn";
+            script {
+               set_state(PART:"elm.swallow.more_btn", "default", 0.0);
+               set_int(more_btn_visible, 0);
+               set_state(PART:"padding_before_right_btn", "default", 0.0);
+               if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+                  set_state(PART:"padding_center_text2", "default", 0.0);
+                  set_int(large_padded_center_align, 0);
+               }
+               else {
+                  set_state(PART:"padding_center_text2", "visible", 0.0);
+                  set_int(large_padded_center_align, 1);
+               }
+               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else if (get_int(large_padded_center_align) == 1)
+                  set_state(PART:"padding_center_text1", "visible", 0.0);
+               else if (get_int(icon_visible) == 1)
+                  set_state(PART:"padding_center_text1", "icon", 0.0);
+               else
+                  set_state(PART:"padding_center_text1", "default", 0.0);
+            }
          }
          program { name: "icon_show";
             signal: "elm,state,elm.swallow.icon,show";
             source: "elm";
-            action: STATE_SET "icon_visible" 0.0;
-            target: "padding_center_text1";
+            script {
+               set_int(icon_visible, 1);
+               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+               else
+                 set_state(PART:"padding_center_text1", "icon", 0.0);
+            }
          }
          program { name: "icon_hide";
             signal: "elm,state,elm.swallow.icon,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "padding_center_text1";
+            script {
+               set_int(icon_visible, 0);
+               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+                 set_state(PART:"padding_center_text1", "visible", 0.0);
+               else
+                 set_state(PART:"padding_center_text1", "default", 0.0);
+            }
          }
          program { name: "controlbar_show";
             signal: "elm,state,elm.swallow.controlbar,show";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 05661ec..620bfc1 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -38,6 +38,7 @@
 #define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 124 80
 #define NAVIFRAME_TEXT_PADDING_INC 144
 #define NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 278
+#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 186
 #define NAVIFRAME_TITLE_SEGMENT_H_INC 74
 #define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 97aa37e..0f8502e 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -37,6 +37,7 @@
 #define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 6
 #define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 100 53
 #define NAVIFRAME_TEXT_PADDING_INC 112
+#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 38
 #define NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 218
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 144
 #define NAVIFRAME_TITLE_SEGMENT_H_INC 49

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 8c8ce4f..c14aee5 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -37,6 +37,7 @@
 #define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 10
 #define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 124 80
 #define NAVIFRAME_TEXT_PADDING_INC 144
+#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
 #define NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 278
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 186
 #define NAVIFRAME_TITLE_SEGMENT_H_INC 74

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index a0478cb..1b5b09e 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -37,6 +37,7 @@
 #define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 6
 #define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 100 53
 #define NAVIFRAME_TEXT_PADDING_INC 112
+#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 38
 #define NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 218
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 144
 #define NAVIFRAME_TITLE_SEGMENT_H_INC 49