[elc_naviframe]: 1. CQ H0100135601 fixed. 2. if icon is set, then icon

overlaps back button in case of long title text issue fixed.

Change-Id: I2a1ba797afc7d996807aa97d0fc38bdf931120d7

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 3bf7419..d44f9e9 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -252,8 +252,8 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1.to: "title_base";
-               rel2.to: "title_base";
+               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
+               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             }
          }
          part { name: "click_event_area";
@@ -420,6 +420,18 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
+         program { name: "icon_show";
+            signal: "elm,state,elm.swallow.icon,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.rect.pada";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,elm.swallow.icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.rect.pada";
+         }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
             source: "elm";
@@ -767,8 +779,8 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1.to: "title_base";
-               rel2.to: "title_base";
+               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
+               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             }
          }
          part { name: "click_event_area";
@@ -935,6 +947,18 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
+         program { name: "icon_show";
+            signal: "elm,state,elm.swallow.icon,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.rect.pada";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,elm.swallow.icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.rect.pada";
+         }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
             source: "elm";
@@ -1244,8 +1268,8 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1.to: "title_base";
-               rel2.to: "title_base";
+               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
+               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             }
          }
          part { name: "click_event_area";
@@ -1377,6 +1401,18 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
+         program { name: "icon_show";
+            signal: "elm,state,elm.swallow.icon,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.rect.pada";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,elm.swallow.icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.rect.pada";
+         }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
             source: "elm";
@@ -1712,8 +1748,8 @@
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.5 0.5;
-               rel1.to: "title_base";
-               rel2.to: "title_base";
+               rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
+               rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
             }
          }
          part { name: "click_event_area";
@@ -1845,6 +1881,18 @@
             target: "title_clip";
             target: "optionheader_clip";
          }
+         program { name: "icon_show";
+            signal: "elm,state,elm.swallow.icon,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.rect.pada";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,elm.swallow.icon,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.rect.pada";
+         }
          program { name: "optionheader_show";
             signal: "elm,state,elm.swallow.optionheader,show";
             source: "elm";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index d585f7c..a2138fa 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -39,7 +39,7 @@
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
 #define NAVIFRAME_OH_SHADOW_H_INC 0
 #define NAVIFRAME_INDICATOR_W_INC 128
-#define NAVIFRAME_PADDING_EXPANDED_INC 141
+#define NAVIFRAME_PADDING_EXPANDED_INC 160
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index ef8cd9a..6e989bc 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -38,7 +38,7 @@
 #define NAVIFRAME_OH_PADDING_INC 16
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
 #define NAVIFRAME_INDICATOR_W_INC 128
-#define NAVIFRAME_PADDING_EXPANDED_INC 141
+#define NAVIFRAME_PADDING_EXPANDED_INC 160
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0