Refactor and Update button image as tizen style
authorRyuan Choi <ryuan.choi@samsung.com>
Tue, 2 Jul 2013 03:55:50 +0000 (12:55 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 30 Oct 2013 23:59:45 +0000 (23:59 +0000)
[Title] Refactor and Update button image as tizen style
[Issue#] N/A
[Problem] button was blured when bigger scale level
[Cause] N/A
[Solution] Updated image to tizen style

Change-Id: I36b9e7f8ed91bbd9e71baee5c9dd5593a332f552

Source/WebKit/efl/DefaultTheme/CMakeLists.txt
Source/WebKit/efl/DefaultTheme/widget/button/00_button_01.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_dim.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_focus.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/button/button.edc
Source/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/button/img_button_press.png [deleted file]

index 0a68881..1ccfcf5 100644 (file)
@@ -12,9 +12,9 @@ ADD_CUSTOM_COMMAND(
     DEPENDS
         default.edc
         widget/button/button.edc
-        widget/button/img_button_focus.png
-        widget/button/img_button_normal.png
-        widget/button/img_button_press.png
+        widget/button/00_button_01.png
+        widget/button/00_button_01_dim.png
+        widget/button/00_button_01_focus.png
         widget/check/00_check_activated.png
         widget/check/00_check_activated_dim.png
         widget/check/00_check_bg.png
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01.png b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01.png
new file mode 100644 (file)
index 0000000..c762205
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_dim.png b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_dim.png
new file mode 100644 (file)
index 0000000..514efea
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_dim.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_focus.png b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_focus.png
new file mode 100644 (file)
index 0000000..780a79b
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/button/00_button_01_focus.png differ
index 8cd8f51..39d6fb5 100644 (file)
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
     Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2009,2010 Samsung Electronics
+    Copyright (C) 2009-2013 Samsung Electronics
 
     This file is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     Boston, MA 02110-1301, USA.
 */
 
-   group {
-      name: "webkit/widget/button";
+group { name: "webkit/widget/button";
+   data { item: "scale" "5"; }
 
-      images {
-         image: "widget/button/img_button_normal.png" COMP;
-         image: "widget/button/img_button_press.png" COMP;
-         image: "widget/button/img_button_focus.png" COMP;
-      }
-
-      script {
-          public isEnabled;
-          public isPressed;
-          public isChecked;
-          public isFocused;
-
-          public show() {
+   images {
+      image: "widget/button/00_button_01.png" COMP;
+      image: "widget/button/00_button_01_dim.png" COMP;
+      image: "widget/button/00_button_01_focus.png" COMP;
+   }
 
-              if (get_int(isEnabled) == 1) {
-                  set_state(PART:"button", "default", 0.0);
-                  if (get_int(isFocused) == 1) {
-                      set_state(PART:"button", "focused", 0.0);
-                      if (get_int(isPressed) == 1)
-                          set_state(PART:"button", "pressed", 0.0);
-                      }
-              }
-              else
-                  set_state(PART:"button", "disabled", 0.0);
-          }
-      }
+   script {
+       public isEnabled;
+       public isPressed;
+       public isChecked;
+       public isFocused;
 
-      parts {
+       public show() {
+           if (get_int(isEnabled) == 1) {
+               set_state(PART:"button", "default", 0.0);
+               if (get_int(isFocused) == 1)
+                   set_state(PART:"focus", "focused", 0.0);
+               else
+                   set_state(PART:"focus", "default", 0.0);
+           }
+           else
+               set_state(PART:"button", "disabled", 0.0);
+       }
+   }
 
-         part {
-            name: "button";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               min: 20 20;
-               image {
-                  normal: "widget/button/img_button_normal.png";
-                  border: 2 2 2 2;
-               }
+   parts {
+      part { name: "button";
+         type: IMAGE;
+         description {
+            state: "default" 0.0;
+            min: 20 20;
+            image {
+               normal: "widget/button/00_button_01.png";
+               border: 5 5 5 5;
             }
-            description {
-               state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/button/img_button_press.png";
-                  border: 2 2 2 2;
-               }
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 150;
+         }
+         description {
+            state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            image {
+               normal: "widget/button/00_button_01_dim.png";
+               border: 5 5 5 5;
             }
-            description {
-               state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "widget/button/img_button_focus.png";
-                  border: 2 2 2 2;
-               }
+         }
+      }
+      part { name: "focus";
+         description {
+            state: "default" 0.0;
+            min: 20 20;
+            visible: 0;
+         }
+         type: IMAGE;
+         description {
+            state: "focused" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image {
+               normal: "widget/button/00_button_01_focus.png";
+               border: 5 5 5 5;
             }
          }
+      }
 
-         part {
-            name: "text_confinement";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: 4 4;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: -4 -4;
-               }
+      part { name: "text_confinement";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 5 5;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -5 -5;
             }
          }
       }
+   }
 
-      programs {
-         program {
-            name: "enabled";
-            signal: "enabled";
-            script {
-               set_int(isEnabled, 1);
-               show();
-            }
+   programs {
+      program {
+         name: "enabled";
+         signal: "enabled";
+         script {
+            set_int(isEnabled, 1);
+            show();
          }
-         program {
-            name: "pressed";
-            signal: "pressed";
-            script {
-               set_int(isPressed, 1);
-               show();
-            }
+      }
+      program {
+         name: "pressed";
+         signal: "pressed";
+         script {
+            set_int(isPressed, 1);
+            show();
          }
-        program {
-            name: "checked";
-            signal: "checked";
-            script {
-               set_int(isChecked, 1);
-               show();
-            }
+      }
+     program {
+         name: "checked";
+         signal: "checked";
+         script {
+            set_int(isChecked, 1);
+            show();
          }
-         program {
-            name: "focused";
-            signal: "focused";
-            script {
-               set_int(isFocused, 1);
-               show();
-            }
+      }
+      program {
+         name: "focused";
+         signal: "focused";
+         script {
+            set_int(isFocused, 1);
+            show();
          }
-        program {
-            name: "reset";
-            signal: "reset";
-            script {
-               set_int(isEnabled, 0);
-               set_int(isPressed, 0);
-               set_int(isChecked, 0);
-               set_int(isFocused, 0);
-               show();
-            }
+      }
+     program {
+         name: "reset";
+         signal: "reset";
+         script {
+            set_int(isEnabled, 0);
+            set_int(isPressed, 0);
+            set_int(isChecked, 0);
+            set_int(isFocused, 0);
+            show();
          }
       }
    }
+}
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png b/Source/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png
deleted file mode 100644 (file)
index 2951522..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png b/Source/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png
deleted file mode 100644 (file)
index d3e9351..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_press.png b/Source/WebKit/efl/DefaultTheme/widget/button/img_button_press.png
deleted file mode 100644 (file)
index bf00316..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_press.png and /dev/null differ