[elc_naviframe]: backbutton moved on right side of control bar area.

diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc
index e4c3a60..fd8d8ed 100644 (file)
--- a/themes/inc/tizen-black-hd-inc.edc
+++ b/themes/inc/tizen-black-hd-inc.edc
@@ -47,7 +47,6 @@
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
-#define NAVIFRAME_CONTROLBAR_PADDING_INC 5
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 37 48 54 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255

diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc
index aa4bedd..0d3629d 100644 (file)
--- a/themes/inc/tizen-black-inc.edc
+++ b/themes/inc/tizen-black-inc.edc
@@ -47,7 +47,6 @@
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 24
 #define NAVIFRAME_ICON_SIZE_INC 20 20
 #define NAVIFRAME_ICON_PADDING_INC 10 0
-#define NAVIFRAME_CONTROLBAR_PADDING_INC 3
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 31 31 31 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 249 249 249 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 108 108 108 255

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 799ace0..9dff65c 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -47,7 +47,6 @@
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 36
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0
-#define NAVIFRAME_CONTROLBAR_PADDING_INC 5
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 100 85 66 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255

diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc
index e4a7b19..695ae59 100644 (file)
--- a/themes/inc/tizen-inc.edc
+++ b/themes/inc/tizen-inc.edc
@@ -47,7 +47,6 @@
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 24
 #define NAVIFRAME_ICON_SIZE_INC 21 21
 #define NAVIFRAME_ICON_PADDING_INC 10 0
-#define NAVIFRAME_CONTROLBAR_PADDING_INC 3
 #define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 100 85 66 255
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 21607da..618ddb0 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -443,9 +443,9 @@
                min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
                fixed: 1 1;
-               align: 0.0 0.0;
-               rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
                visible: 0;
             }
          }
@@ -465,22 +465,8 @@
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
-               rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-               rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
-            }
-         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
                rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
             }
          }
       }
@@ -1333,53 +1319,39 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
-              visible: 0;
-           }
-        }
-        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;
-              rel1.to: "elm.prev_btn_bg";
-              rel2.to: "elm.prev_btn_bg";
-           }
-        }
-        part { name: "elm.swallow.controlbar";
-           type: SWALLOW;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
-           }
-        }
-         part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
+               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
                fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
                rel2.to: "controlbar_bg";
                visible: 0;
             }
          }
+         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;
+               rel1.to: "elm.prev_btn_bg";
+               rel2.to: "elm.prev_btn_bg";
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
       }
       programs {
          program { name: "content_new_pushed";
@@ -2071,9 +2043,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -2093,24 +2065,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "content_new_pushed";
@@ -2367,9 +2325,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -2389,24 +2347,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "content_new_pushed";
@@ -2969,9 +2913,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -2991,24 +2935,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "cur_pushed";
@@ -3796,9 +3726,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -3818,24 +3748,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "cur_pushed";
@@ -4452,9 +4368,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -4474,24 +4390,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "cur_pushed";
@@ -4678,9 +4580,9 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
               fixed: 1 1;
-              align: 0.0 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "controlbar_bg"; }
+              align: 1.0 0.0;
+              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+              rel2.to: "controlbar_bg";
               visible: 0;
            }
         }
@@ -4700,24 +4602,10 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              rel1 { relative: 1.0 0.0; to: "elm.prev_btn_bg"; }
-              rel2 { relative: 0.0 1.0; to: "padding_after_controlbar"; }
+              rel1.to: "controlbar_bg";
+              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
            }
         }
-         part { name: "padding_after_controlbar";
-            type: RECT;
-            scale: 1;
-            clip_to: "controlbar_clip";
-            description { state: "default" 0.0;
-               min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
-               align: 1 1;
-               rel1.to: "controlbar_bg";
-               rel2.to: "controlbar_bg";
-               visible: 0;
-            }
-         }
       }
       programs {
          program { name: "cur_pushed";