[merge conflict resolved]

[Navigationbar_ex]: RSS issue icon overlaps left button separator when
text size is increased fixed.

Change-Id: I5bc8d8396e427db4b6efca6072498eae8dd2affc

diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
index 738fc14..5b4e3fc 100644 (file)
--- a/themes/groups/navigationbar_ex.edc
+++ b/themes/groups/navigationbar_ex.edc
@@ -241,7 +241,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
+            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
          }
       }
       part { name: "separator_1";
@@ -323,7 +323,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
             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;
+            min: NAVIBAR_EX_ICON_PADDING_INC 0;
             visible: 0;
          }
       }
@@ -473,7 +473,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
+            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
          }
       }
       part { name: "separator_1";
@@ -563,7 +563,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             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;
+            min: NAVIBAR_EX_ICON_PADDING_INC 0;
             visible: 0;
          }
       }
@@ -813,7 +813,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
+            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
          }
       }
       part { name: "separator_1";
@@ -904,7 +904,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
             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;
+            min: NAVIBAR_EX_ICON_PADDING_INC 0;
             visible: 0;
          }
       }

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 5b4e355..fde255e 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -703,6 +703,8 @@
 #define NAVIBAR_EX_TITLE_ICON_HEIGHT 20
 #define NAVIBAR_EX_TITLE_INDICATOR_W 80
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
+#define NAVIBAR_EX_PADDING_EXPANDED_INC 96
+#define NAVIBAR_EX_ICON_PADDING_INC 4
 
 #define CALENDAR_DAY_FONT_SIZE_INC 15
 #define CALENDAR_DATE_FONT_SIZE_INC 20

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index a87887c..e829155 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -732,6 +732,8 @@
 #define NAVIBAR_EX_TITLE_ICON_HEIGHT 32
 #define NAVIBAR_EX_TITLE_INDICATOR_W 128
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 130
+#define NAVIBAR_EX_PADDING_EXPANDED_INC 150
+#define NAVIBAR_EX_ICON_PADDING_INC 8
 
 #define CALENDAR_DAY_FONT_SIZE_INC 22
 #define CALENDAR_DATE_FONT_SIZE_INC 30

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index ede3712..fbea762 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -726,6 +726,8 @@
 #define NAVIBAR_EX_TITLE_ICON_HEIGHT 20
 #define NAVIBAR_EX_TITLE_INDICATOR_W 80
 #define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
+#define NAVIBAR_EX_PADDING_EXPANDED_INC 96
+#define NAVIBAR_EX_ICON_PADDING_INC 4
 
 #define CALENDAR_DAY_FONT_SIZE_INC 15
 #define CALENDAR_DATE_FONT_SIZE_INC 20