projects / framework / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0271165)
[*][naviframe] rollback the latest change, because of broken view in dialer
authorWooHyun Jung <wh0705.jung@samsung.com>
Fri, 18 Nov 2011 02:27:36 +0000 (11:27 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Fri, 18 Nov 2011 02:27:36 +0000 (11:27 +0900)
themes/groups/naviframe.edc patch | blob | history

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 84e01ed..b7186e0 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -66,8 +66,10 @@
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
+               rel1.to_x: "elm.swallow.content";
                rel1.to_y: "title_clip";
                rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
                rel2.to_y: "title_clip";
                visible: 0;
             }
@@ -93,16 +95,6 @@
                   border: 0 0 4 0;
                }
             }
-            description { state: "left" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
-            }
-            description { state: "right" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 2.0 1.0;
-            }
          }
          part { name: "optionheader_top_padding";
             type: RECT;
@@ -157,11 +149,20 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
-               rel2.to_x: "optionheader_bg";
+               rel1.to_y: "optionheader_bg";
+               rel2.relative: 1.0 0.0;
                rel2.to_y: "controlbar_bg";
             }
+           description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 1.0;
+               rel2.relative: 0.0 0.0;
+           }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 2.0 0.0;
+            }
          }
          part { name: "title_base";
             type: RECT;
@@ -385,8 +386,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
-               rel1.to_x: "optionheader_bg";
-               rel2.to_x: "optionheader_bg";
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
@@ -440,7 +441,7 @@
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -448,7 +449,7 @@
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
@@ -456,7 +457,7 @@
             signal: "elm,state,prev,popped,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -464,7 +465,7 @@
             signal: "elm,state,cur,popped,internal";
             source: "";
             action: STATE_SET "right" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
@@ -472,7 +473,7 @@
             signal: "elm,state,cur,pushed";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
                emit("elm,state,cur,pushed,internal", "");
             }
          }
@@ -480,7 +481,7 @@
             signal: "elm,state,new,pushed";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "right", 0.0);
+               set_state(PART:"elm.swallow.content", "right", 0.0);
                emit("elm,state,new,pushed,internal", "");
             }
          }
@@ -488,7 +489,7 @@
             signal: "elm,state,prev,popped";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "left", 0.0);
+               set_state(PART:"elm.swallow.content", "left", 0.0);
                emit("elm,state,prev,popped,internal", "");
             }
          }
@@ -496,7 +497,7 @@
             signal: "elm,state,cur,popped";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
                emit("elm,state,cur,popped,internal", "");
             }
          }
@@ -504,7 +505,7 @@
             signal: "elm,state,visible";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
          }
          program { name: "title_show";
             signal: "elm,state,title,show";
@@ -735,8 +736,10 @@
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
+               rel1.to_x: "elm.swallow.content";
                rel1.to_y: "title_clip";
                rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
                rel2.to_y: "title_clip";
                visible: 0;
             }
@@ -762,16 +765,6 @@
                   border: 0 0 4 0;
                }
             }
-            description { state: "left" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
-            }
-            description { state: "right" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 2.0 1.0;
-            }
          }
          part { name: "optionheader_top_padding";
             type: RECT;
@@ -851,11 +844,20 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1.relative: 0.0 1.0;
-               rel1.to: "optionheader_bg";
-               rel2.relative: 1.0 1.0;
-               rel2.to_x: "optionheader_bg";
+               rel1.to_y: "optionheader_bg";
+               rel2.relative: 1.0 0.0;
                rel2.to_y: "controlbar_bg";
             }
+           description { state: "left" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 1.0;
+               rel2.relative: 0.0 0.0;
+           }
+            description { state: "right" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 2.0 0.0;
+            }
          }
          part { name: "title_base";
             type: RECT;
@@ -1079,8 +1081,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
-               rel1.to_x: "optionheader_bg";
-               rel2.to_x: "optionheader_bg";
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
@@ -1134,7 +1136,7 @@
             signal: "elm,state,new,pushed,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -1142,7 +1144,7 @@
             signal: "elm,state,cur,pushed,internal";
             source: "";
             action: STATE_SET "left" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "pushed_finished";
          }
@@ -1150,7 +1152,7 @@
             signal: "elm,state,prev,popped,internal";
             source: "";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "show_finished";
          }
@@ -1158,7 +1160,7 @@
             signal: "elm,state,cur,popped,internal";
             source: "";
             action: STATE_SET "right" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
             transition: DECELERATE 0.5;
             after: "popped_finished";
          }
@@ -1166,7 +1168,7 @@
             signal: "elm,state,cur,pushed";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
                emit("elm,state,cur,pushed,internal", "");
             }
          }
@@ -1174,7 +1176,7 @@
             signal: "elm,state,new,pushed";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "right", 0.0);
+               set_state(PART:"elm.swallow.content", "right", 0.0);
                emit("elm,state,new,pushed,internal", "");
             }
          }
@@ -1182,7 +1184,7 @@
             signal: "elm,state,prev,popped";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "left", 0.0);
+               set_state(PART:"elm.swallow.content", "left", 0.0);
                emit("elm,state,prev,popped,internal", "");
             }
          }
@@ -1190,7 +1192,7 @@
             signal: "elm,state,cur,popped";
             source: "elm";
             script {
-               set_state(PART:"optionheader_bg", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
                emit("elm,state,cur,popped,internal", "");
             }
          }
@@ -1198,7 +1200,7 @@
             signal: "elm,state,visible";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "optionheader_bg";
+            target: "elm.swallow.content";
          }
          program { name: "title_show";
             signal: "elm,state,title,show";
@@ -2123,8 +2125,10 @@
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
+               rel1.to_x: "elm.swallow.content";
                rel1.to_y: "title_clip";
                rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
                rel2.to_y: "title_clip";
                visible: 0;
             }
@@ -2431,6 +2435,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
@@ -2731,8 +2737,10 @@
                min: 1 0;
                align: 0.5 0;
                fixed: 0 1;
+               rel1.to_x: "elm.swallow.content";
                rel1.to_y: "title_clip";
                rel1.relative: 0 1;
+               rel2.to_x: "elm.swallow.content";
                rel2.to_y: "title_clip";
                visible: 0;
             }
@@ -3064,6 +3072,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
@@ -3564,6 +3574,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
@@ -3759,6 +3771,8 @@
                align: 0.5 1;
                color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel2.to_x: "elm.swallow.content";
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
Domain: UI Framework / Uncategorized;