[white space removed][Merge conflict resolved]

[elm_navigationabar_ex]: 1. icon support 2. center aligned text support with out overlapping.
Change-Id: I2858e3c25bbbbc0f8cf5e71cb0c46ca7d1d2559f

diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
index 951fff3..961b555 100644 (file)
--- a/themes/groups/navigationbar_ex.edc
+++ b/themes/groups/navigationbar_ex.edc
@@ -217,12 +217,16 @@ group { name: "elm/navigationbar_ex/item/title/default";
       part { name: "elm.rect.pada";
          mouse_events: 0;
          description { state: "default" 0.0;
-            min: 67 0;
+            min: 82 0;
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
          }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: 122 0;
+         }
       }
       part { name: "elm.rect.padb";
          mouse_events: 0;
@@ -253,6 +257,32 @@ group { name: "elm/navigationbar_ex/item/title/default";
          }
       }
       part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         clip_to: "clip_title";
+         scale: 1;
+         description { state: "default" 0.0;
+            max: 40 40;
+            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "padding_before_text";
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 0.5;
+            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
+            fixed: 1 0;
+            min: 1 0;
+         }
+      }
+      part {
          name: "clip_content";
          mouse_events: 0;
          description { state: "default" 0.0;
@@ -323,6 +353,20 @@ group { name: "elm/navigationbar_ex/item/title/default";
          target: "base";
          transition: LINEAR 0.2;
       }
+      program {
+         name: "show_icon";
+         signal: "elm,state,icon,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.rect.pada";
+      }
+      program {
+         name: "hide_icon";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.rect.pada";
+      }
    }
 }
 
@@ -385,12 +429,16 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
       part { name: "elm.rect.pada";
          mouse_events: 0;
          description { state: "default" 0.0;
-            min: 67 0;
+            min: 82 0;
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
          }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: 122 0;
+         }
       }
       part { name: "elm.rect.padb";
          mouse_events: 0;
@@ -430,6 +478,32 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          }
       }
       part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         clip_to: "clip_title";
+         scale: 1;
+         description { state: "default" 0.0;
+            max: 40 40;
+            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "padding_before_text";
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 0.5;
+            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
+            fixed: 1 0;
+            min: 1 0;
+         }
+      }
+      part {
          name: "clip_content";
          mouse_events: 0;
          description { state: "default" 0.0;
@@ -546,6 +620,20 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
+      program {
+         name: "show_icon";
+         signal: "elm,state,icon,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.rect.pada";
+      }
+      program {
+         name: "hide_icon";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.rect.pada";
+      }
    }
 }
 
@@ -608,12 +696,16 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
       part { name: "elm.rect.pada";
          mouse_events: 0;
          description { state: "default" 0.0;
-            min: 67 0;
+            min: 82 0;
             fixed: 1 0;
             align: 0.0 0.5;
             rel1 { relative: 0.0 0.0; to: "navigationitem"; }
             rel2 { relative: 0.0 1.0; to: "navigationitem"; }
          }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: 122 0;
+         }
       }
       part { name: "elm.rect.padb";
          mouse_events: 0;
@@ -653,6 +745,32 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          }
       }
       part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         clip_to: "clip_title";
+         scale: 1;
+         description { state: "default" 0.0;
+            max: 40 40;
+            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "padding_before_text";
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1.0 0.5;
+            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
+            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
+            fixed: 1 0;
+            min: 1 0;
+         }
+      }
+      part {
          name: "clip_content";
          mouse_events: 0;
          description { state: "default" 0.0;
@@ -768,6 +886,20 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          target: "elm.swallow.title";
          transition: LINEAR 0.2;
       }
+      program {
+         name: "show_icon";
+         signal: "elm,state,icon,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.rect.pada";
+      }
+      program {
+         name: "hide_icon";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.rect.pada";
+      }
    }
 }
 
@@ -786,7 +918,6 @@ group { name: "elm/standard/navigationbar_ex/title_obj2";
       }
       part {
          name: "padding";
-         type: RECT;
          description { state: "default" 0.0;
             min: 0 1;
             fixed: 0 1;