projects / platform / core / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aab3768)
[naviframe] UX4.4 Apply bg images to title_bg and toolbar_bg
authorjae_hyun.cho <jae_hyun.cho@samsung.com>
Fri, 5 Apr 2013 01:31:06 +0000 (10:31 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Sat, 6 Apr 2013 01:10:11 +0000 (10:10 +0900)
Change-Id: I8f213d7766bc06af914a50983b59bc024d1c5f89

themes/images/tizen-hd/00_title_bg.png [new file with mode: 0755] patch | blob
themes/images/tizen-hd/00_toolbar_bg.png [new file with mode: 0755] patch | blob
themes/inc/tizen-hd-inc.edc patch | blob | history
themes/widgets/naviframe.edc patch | blob | history

diff --git a/themes/images/tizen-hd/00_title_bg.png b/themes/images/tizen-hd/00_title_bg.png
new file mode 100755 (executable)
index 0000000..eef8f3a
Binary files /dev/null and b/themes/images/tizen-hd/00_title_bg.png differ
diff --git a/themes/images/tizen-hd/00_toolbar_bg.png b/themes/images/tizen-hd/00_toolbar_bg.png
new file mode 100755 (executable)
index 0000000..eef8f3a
Binary files /dev/null and b/themes/images/tizen-hd/00_toolbar_bg.png differ
diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 436427e..4a1f18e 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -28,8 +28,6 @@
 #define LAYOUT_INDICATOR_HEIGHT_INC 60
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
-#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
-#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
 #define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
 #define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC 0 15
 #define NAVIFRAME_TITLE_TOP_PADDING2_INC 0 18
@@ -77,6 +75,8 @@
 #define NAVIFRAME_BADGE_TEXT_H_INC 26
 #define NAVIFRAME_BADGE_TEXT_W_INC 42
 #define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 48
+#define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 8 8
+#define NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC 8 8 8 8
 #define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
 #define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
 #define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 16
diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 811603e..154be08 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -21,6 +21,8 @@
 
    group { name: "elm/naviframe/item/basic/default";
       images {
+         image: "00_title_bg.png" COMP;
+         image: "00_toolbar_bg.png" COMP;
          image: "00_badge_bg.png" COMP;
       }
       script {
@@ -50,7 +52,6 @@
             }
          }
          part { name: "title_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_TITLE_H_INC;
@@ -58,7 +59,11 @@
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; to: "base"; }
                rel2 { relative: 1.0 0.0; to: "base"; }
-               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+               image {
+                  normal: "00_title_bg.png";
+                  border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
@@ -578,7 +583,6 @@
             }
          }
          part { name: "toolbar_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
@@ -588,7 +592,11 @@
                visible: 0;
                rel1 { to: "base"; }
                rel2 { to: "base"; }
-               color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
+               image {
+                  normal: "00_toolbar_bg.png";
+                  border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -1191,6 +1199,10 @@
    }
 
    group { name: "elm/naviframe/item/tabbar/default";
+      images {
+         image: "00_title_bg.png" COMP;
+         image: "00_toolbar_bg.png" COMP;
+      }
       script {
          public tbar_bg = 0;     //Controlbar BG Show call count
          public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
@@ -1216,7 +1228,6 @@
             }
          }
          part { name: "title_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_TAB_TITLE_H_INC;
@@ -1224,7 +1235,11 @@
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; to: "base"; }
                rel2 { relative: 1.0 0.0; to: "base"; }
-               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+               image {
+                  normal: "00_title_bg.png";
+                  border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
@@ -1429,7 +1444,6 @@
             }
          }
          part { name: "toolbar_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
@@ -1439,7 +1453,11 @@
                visible: 0;
                rel1 { to: "base"; }
                rel2 { to: "base"; }
-               color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
+               image {
+                  normal: "00_toolbar_bg.png";
+                  border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -1910,6 +1928,10 @@
    }
 
    group { name: "elm/naviframe/item/tabbar/notitle/default";
+      images {
+         image: "00_title_bg.png" COMP;
+         image: "00_toolbar_bg.png" COMP;
+      }
       script {
          public tbar_bg = 0;     //Toolbar BG Show call count
          public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
@@ -1935,7 +1957,6 @@
             }
          }
          part { name: "title_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_TITLE_H_INC;
@@ -1943,7 +1964,11 @@
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; to: "base"; }
                rel2 { relative: 1.0 0.0; to: "base"; }
-               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+               image {
+                  normal: "00_title_bg.png";
+                  border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
@@ -2011,7 +2036,6 @@
             }
          }
          part { name: "toolbar_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
@@ -2021,7 +2045,11 @@
                visible: 0;
                rel1 { to: "base"; }
                rel2 { to: "base"; }
-               color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
+               image {
+                  normal: "00_toolbar_bg.png";
+                  border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -2483,6 +2511,10 @@
    }
 
    group { name: "elm/naviframe/item/empty/default";
+      images {
+         image: "00_title_bg.png" COMP;
+         image: "00_toolbar_bg.png" COMP;
+      }
       script {
          public tbar_bg = 0;     //Toolbar BG Show call count
          public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
@@ -2508,12 +2540,15 @@
             }
          }
          part { name: "title_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                rel1 { to: "title"; }
                rel2 { to: "title"; }
-               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+               image {
+                  normal: "00_title_bg.png";
+                  border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
@@ -2567,7 +2602,6 @@
             }
          }
          part { name: "toolbar_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
@@ -2577,7 +2611,11 @@
                visible: 0;
                rel1 { to: "base"; }
                rel2 { to: "base"; }
-               color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
+               image {
+                  normal: "00_toolbar_bg.png";
+                  border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -3127,6 +3165,8 @@
 
    group { name: "elm/naviframe/item/dual_title/default";
       images {
+         image: "00_title_bg.png" COMP;
+         image: "00_toolbar_bg.png" COMP;
          image: "00_badge_bg.png" COMP;
          image: "00_divider_line.png" COMP;
       }
@@ -3155,7 +3195,6 @@
             }
          }
          part { name: "title_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 1 NAVIFRAME_TITLE_H_INC;
@@ -3163,7 +3202,11 @@
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; to: "base"; }
                rel2 { relative: 1.0 0.0; to: "base"; }
-               color: NAVIFRAME_TITLE_BG_COLOR_INC;
+               image {
+                  normal: "00_title_bg.png";
+                  border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
@@ -3704,7 +3747,6 @@
             }
          }
          part { name: "toolbar_bg";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
@@ -3714,7 +3756,11 @@
                visible: 0;
                rel1 { to: "base"; }
                rel2 { to: "base"; }
-               color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
+               image {
+                  normal: "00_toolbar_bg.png";
+                  border: NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
Domain: UI Framework / EFL;