[Naviframe]: PLM Issue - Myfile application controlbar overlapping

backbutton fixed.

Change-Id: I6ff0a518546deafab4eb87330aae81511e34ec87

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 1c8bc84..dd1ee28 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -390,18 +390,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-            }
-         }
          part { name: "elm.prev_btn_bg";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 0;
                fixed: 1 0;
@@ -418,7 +409,6 @@
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
                align: 0.5 0.5;
@@ -426,14 +416,22 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
+         part { name: "controlbar_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
          part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel1.to: "controlbar_clip";
+               rel2.to: "controlbar_clip";
             }
          }
       }
@@ -1116,18 +1114,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-            }
-         }
          part { name: "elm.prev_btn_bg";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 0;
                fixed: 1 0;
@@ -1144,7 +1133,6 @@
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
                align: 0.5 0.5;
@@ -1152,14 +1140,22 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
+         part { name: "controlbar_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
          part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel1.to: "controlbar_clip";
+               rel2.to: "controlbar_clip";
             }
          }
       }
@@ -1620,18 +1616,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_bg"; }
-               rel2 { to: "controlbar_bg"; }
-            }
-         }
          part { name: "elm.prev_btn_bg";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 0;
                fixed: 1 0;
@@ -1648,7 +1635,6 @@
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
-           clip_to: "controlbar_clip";
            description { state: "default" 0.0;
               fixed: 1 1;
               align: 0.5 0.5;
@@ -1656,16 +1642,24 @@
               rel2.to: "elm.prev_btn_bg";
            }
         }
-        part { name: "controlbar";
-           type: SWALLOW;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
-           }
-        }
+         part { name: "controlbar_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
+         part { name: "controlbar";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "controlbar_clip";
+               rel2.to: "controlbar_clip";
+            }
+         }
       }
       programs {
          program { name: "content_new_pushed";
@@ -1911,18 +1905,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_bg"; }
-               rel2 { to: "controlbar_bg"; }
-            }
-         }
          part { name: "elm.prev_btn_bg";
            type: RECT;
            scale: 1;
-           clip_to: "controlbar_clip";
            description { state: "default" 0.0;
               min: 0 0;
               fixed: 1 0;
@@ -1939,7 +1924,6 @@
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
                align: 0.5 0.5;
@@ -1947,14 +1931,22 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
+         part { name: "controlbar_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
          part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel1.to: "controlbar_clip";
+               rel2.to: "controlbar_clip";
             }
          }
       }
@@ -2461,18 +2453,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-            }
-         }
          part { name: "elm.prev_btn_bg";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 0;
                fixed: 1 0;
@@ -2489,7 +2472,6 @@
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
                align: 0.5 0.5;
@@ -2497,14 +2479,22 @@
                rel2.to: "elm.prev_btn_bg";
             }
          }
+         part { name: "controlbar_clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
          part { name: "controlbar";
             type: SWALLOW;
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                fixed: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel1.to: "controlbar_clip";
+               rel2.to: "controlbar_clip";
             }
          }
       }