Merge "[Naviframe]: 1. segment 4 support added to segment style. 2. icon support...

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 6f9e467..e7944c3 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -2023,6 +2023,24 @@
                visible: 1;
             }
          }
+         part { name: "padding_center_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 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" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
+            }
+         }
          part { name: "padding_before_text";
             type: RECT;
             scale: 1;
@@ -2037,6 +2055,20 @@
                visible: 0;
             }
          }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               max: NAVIFRAME_ICON_SIZE_INC;
+               fixed: 1 1;
+               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
+               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 1.0 0.5;
+            }
+         }
          part { name: "elm.text.title";
             type: TEXT;
             scale: 1;
@@ -2054,7 +2086,9 @@
                fixed: 1 1;
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0;
-               rel1.to: "title_bg";
+               rel1.to_x: "padding_center_text";
+               rel1.to_y: "title_bg";
+               rel1.relative: 1.0 0.0;
                rel2.to: "title_bg";
             }
          }
@@ -2131,6 +2165,23 @@
                rel2.relative: 0.8 1;
             }
          }
+         part { name: "segment4";
+            type: "SWALLOW";
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.02 1;
+               rel1.to_x: "title_bg";
+               rel2.to_y: "elm.text.title";
+               rel2.to_x: "title_bg";
+               rel2.relative: 0.98 1;
+            }
+         }
          part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
@@ -2305,6 +2356,18 @@
             action: STATE_SET "default" 0.0;
             target: "right_btn_separator";
          }
+         program { name: "icon_show";
+            signal: "elm,state,icon,show";
+            source: "elm";
+            action: STATE_SET "icon" 0.0;
+            target: "padding_center_text";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "padding_center_text";
+         }
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
@@ -4512,6 +4575,24 @@
                visible: 1;
             }
          }
+         part { name: "padding_center_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 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" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
+            }
+         }
          part { name: "padding_before_text";
             type: RECT;
             scale: 1;
@@ -4543,7 +4624,9 @@
                fixed: 1 1;
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0;
-               rel1.to: "title_bg";
+               rel1.to_x: "padding_center_text";
+               rel1.to_y: "title_bg";
+               rel1.relative: 1.0 0.0;
                rel2.to: "title_bg";
             }
          }
@@ -4620,6 +4703,23 @@
                rel2.relative: 0.8 1;
             }
          }
+         part { name: "segment4";
+            type: "SWALLOW";
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               rel1.to_y: "elm.text.title";
+               rel1.relative: 0.02 1;
+               rel1.to_x: "title_bg";
+               rel2.to_y: "elm.text.title";
+               rel2.to_x: "title_bg";
+               rel2.relative: 0.98 1;
+            }
+         }
          part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
@@ -4742,6 +4842,18 @@
             action: STATE_SET "default" 0.0;
             target: "right_btn_separator";
          }
+         program { name: "icon_show";
+            signal: "elm,state,icon,show";
+            source: "elm";
+            action: STATE_SET "icon" 0.0;
+            target: "padding_center_text";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "padding_center_text";
+         }
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";