2010-08-11 Rafael Antognolli <antognolli@profusion.mobi>
authordemarchi@webkit.org <demarchi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Aug 2010 19:16:53 +0000 (19:16 +0000)
committerdemarchi@webkit.org <demarchi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Aug 2010 19:16:53 +0000 (19:16 +0000)
        Reviewed by Kenneth Rohde Christiansen.

        [EFL] Adding new theme for widgets.
        https://bugs.webkit.org/show_bug.cgi?id=43860

        Original theme was there for a long time. This is a new
        fresh one.

        * DefaultTheme/default.edc:
        * DefaultTheme/widget/button/button.edc:
        * DefaultTheme/widget/button/img_button_focus.png:
        * DefaultTheme/widget/button/img_button_hover.png:
        * DefaultTheme/widget/button/img_button_normal.png:
        * DefaultTheme/widget/button/img_button_press.png:
        * DefaultTheme/widget/check/check.edc:
        * DefaultTheme/widget/check/img_check_off.png:
        * DefaultTheme/widget/check/img_check_off_focus.png:
        * DefaultTheme/widget/check/img_check_off_hover.png:
        * DefaultTheme/widget/check/img_check_on.png:
        * DefaultTheme/widget/check/img_check_on_focus.png:
        * DefaultTheme/widget/check/img_check_on_hover.png:
        * DefaultTheme/widget/combo/combo.edc:
        * DefaultTheme/widget/combo/combo_focus.png:
        * DefaultTheme/widget/combo/combo_focus_button.png:
        * DefaultTheme/widget/combo/combo_hover.png:
        * DefaultTheme/widget/combo/combo_hover_button.png:
        * DefaultTheme/widget/combo/combo_normal.png:
        * DefaultTheme/widget/combo/combo_normal_button.png:
        * DefaultTheme/widget/combo/combo_press.png:
        * DefaultTheme/widget/combo/combo_press_button.png:
        * DefaultTheme/widget/combo/icon.png:
        * DefaultTheme/widget/entry/img_focused.png:
        * DefaultTheme/widget/entry/img_hovered.png:
        * DefaultTheme/widget/entry/img_normal.png:
        * DefaultTheme/widget/file/file_focus.png:
        * DefaultTheme/widget/file/file_hover.png:
        * DefaultTheme/widget/file/file_normal.png:
        * DefaultTheme/widget/file/file_press.png:
        * DefaultTheme/widget/radio/img_radio_off.png:
        * DefaultTheme/widget/radio/img_radio_off_focus.png:
        * DefaultTheme/widget/radio/img_radio_off_hover.png:
        * DefaultTheme/widget/radio/img_radio_on.png:
        * DefaultTheme/widget/radio/img_radio_on_focus.png:
        * DefaultTheme/widget/radio/img_radio_on_hover.png:
        * DefaultTheme/widget/radio/radio.edc:
        * DefaultTheme/widget/scrollbar/scrollbar.edc:
        * DefaultTheme/widget/scrollbar/scrollbar_h.png:
        * DefaultTheme/widget/scrollbar/scrollbar_hilight.png: Removed.
        * DefaultTheme/widget/scrollbar/scrollbar_knob_h.png:
        * DefaultTheme/widget/scrollbar/scrollbar_knob_v.png:
        * DefaultTheme/widget/scrollbar/scrollbar_v.png:
        * DefaultTheme/widget/search/cancel/cancel_normal_button2.png:
        * DefaultTheme/widget/search/decoration/decoration_normal_button.png:
        * DefaultTheme/widget/search/field/field_focused.png:
        * DefaultTheme/widget/search/field/field_hovered.png:
        * DefaultTheme/widget/search/field/field_normal.png:
        * DefaultTheme/widget/slider/slider.edc:
        * DefaultTheme/widget/slider/slider_fill_h.png: Added.
        * DefaultTheme/widget/slider/slider_fill_v.png: Added.
        * DefaultTheme/widget/slider/slider_h.png:
        * DefaultTheme/widget/slider/slider_hilight.png: Removed.
        * DefaultTheme/widget/slider/slider_knob_h.png:
        * DefaultTheme/widget/slider/slider_knob_press_h.png: Added.
        * DefaultTheme/widget/slider/slider_knob_press_v.png: Added.
        * DefaultTheme/widget/slider/slider_knob_v.png:
        * DefaultTheme/widget/slider/slider_v.png:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@65262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

59 files changed:
WebKit/efl/ChangeLog
WebKit/efl/DefaultTheme/default.edc
WebKit/efl/DefaultTheme/widget/button/button.edc
WebKit/efl/DefaultTheme/widget/button/img_button_focus.png
WebKit/efl/DefaultTheme/widget/button/img_button_hover.png
WebKit/efl/DefaultTheme/widget/button/img_button_normal.png
WebKit/efl/DefaultTheme/widget/button/img_button_press.png
WebKit/efl/DefaultTheme/widget/check/check.edc
WebKit/efl/DefaultTheme/widget/check/img_check_off.png
WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png
WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png
WebKit/efl/DefaultTheme/widget/check/img_check_on.png
WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png
WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png
WebKit/efl/DefaultTheme/widget/combo/combo.edc
WebKit/efl/DefaultTheme/widget/combo/combo_focus.png
WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png
WebKit/efl/DefaultTheme/widget/combo/combo_hover.png
WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png
WebKit/efl/DefaultTheme/widget/combo/combo_normal.png
WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png
WebKit/efl/DefaultTheme/widget/combo/combo_press.png
WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png
WebKit/efl/DefaultTheme/widget/combo/icon.png
WebKit/efl/DefaultTheme/widget/entry/img_focused.png
WebKit/efl/DefaultTheme/widget/entry/img_hovered.png
WebKit/efl/DefaultTheme/widget/entry/img_normal.png
WebKit/efl/DefaultTheme/widget/file/file_focus.png
WebKit/efl/DefaultTheme/widget/file/file_hover.png
WebKit/efl/DefaultTheme/widget/file/file_normal.png
WebKit/efl/DefaultTheme/widget/file/file_press.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_off_focus.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png
WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png
WebKit/efl/DefaultTheme/widget/radio/radio.edc
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_h.png
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_hilight.png [deleted file]
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_h.png
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_v.png
WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_v.png
WebKit/efl/DefaultTheme/widget/search/cancel/cancel_normal_button2.png
WebKit/efl/DefaultTheme/widget/search/decoration/decoration_normal_button.png
WebKit/efl/DefaultTheme/widget/search/field/field_focused.png
WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png
WebKit/efl/DefaultTheme/widget/search/field/field_normal.png
WebKit/efl/DefaultTheme/widget/slider/slider.edc
WebKit/efl/DefaultTheme/widget/slider/slider_fill_h.png [new file with mode: 0644]
WebKit/efl/DefaultTheme/widget/slider/slider_fill_v.png [new file with mode: 0644]
WebKit/efl/DefaultTheme/widget/slider/slider_h.png
WebKit/efl/DefaultTheme/widget/slider/slider_hilight.png [deleted file]
WebKit/efl/DefaultTheme/widget/slider/slider_knob_h.png
WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_h.png [new file with mode: 0644]
WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_v.png [new file with mode: 0644]
WebKit/efl/DefaultTheme/widget/slider/slider_knob_v.png
WebKit/efl/DefaultTheme/widget/slider/slider_v.png

index f6cf1d0..f12f94c 100644 (file)
@@ -1,3 +1,72 @@
+2010-08-11  Rafael Antognolli  <antognolli@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Adding new theme for widgets.
+        https://bugs.webkit.org/show_bug.cgi?id=43860
+
+        Original theme was there for a long time. This is a new
+        fresh one.
+
+        * DefaultTheme/default.edc:
+        * DefaultTheme/widget/button/button.edc:
+        * DefaultTheme/widget/button/img_button_focus.png:
+        * DefaultTheme/widget/button/img_button_hover.png:
+        * DefaultTheme/widget/button/img_button_normal.png:
+        * DefaultTheme/widget/button/img_button_press.png:
+        * DefaultTheme/widget/check/check.edc:
+        * DefaultTheme/widget/check/img_check_off.png:
+        * DefaultTheme/widget/check/img_check_off_focus.png:
+        * DefaultTheme/widget/check/img_check_off_hover.png:
+        * DefaultTheme/widget/check/img_check_on.png:
+        * DefaultTheme/widget/check/img_check_on_focus.png:
+        * DefaultTheme/widget/check/img_check_on_hover.png:
+        * DefaultTheme/widget/combo/combo.edc:
+        * DefaultTheme/widget/combo/combo_focus.png:
+        * DefaultTheme/widget/combo/combo_focus_button.png:
+        * DefaultTheme/widget/combo/combo_hover.png:
+        * DefaultTheme/widget/combo/combo_hover_button.png:
+        * DefaultTheme/widget/combo/combo_normal.png:
+        * DefaultTheme/widget/combo/combo_normal_button.png:
+        * DefaultTheme/widget/combo/combo_press.png:
+        * DefaultTheme/widget/combo/combo_press_button.png:
+        * DefaultTheme/widget/combo/icon.png:
+        * DefaultTheme/widget/entry/img_focused.png:
+        * DefaultTheme/widget/entry/img_hovered.png:
+        * DefaultTheme/widget/entry/img_normal.png:
+        * DefaultTheme/widget/file/file_focus.png:
+        * DefaultTheme/widget/file/file_hover.png:
+        * DefaultTheme/widget/file/file_normal.png:
+        * DefaultTheme/widget/file/file_press.png:
+        * DefaultTheme/widget/radio/img_radio_off.png:
+        * DefaultTheme/widget/radio/img_radio_off_focus.png:
+        * DefaultTheme/widget/radio/img_radio_off_hover.png:
+        * DefaultTheme/widget/radio/img_radio_on.png:
+        * DefaultTheme/widget/radio/img_radio_on_focus.png:
+        * DefaultTheme/widget/radio/img_radio_on_hover.png:
+        * DefaultTheme/widget/radio/radio.edc:
+        * DefaultTheme/widget/scrollbar/scrollbar.edc:
+        * DefaultTheme/widget/scrollbar/scrollbar_h.png:
+        * DefaultTheme/widget/scrollbar/scrollbar_hilight.png: Removed.
+        * DefaultTheme/widget/scrollbar/scrollbar_knob_h.png:
+        * DefaultTheme/widget/scrollbar/scrollbar_knob_v.png:
+        * DefaultTheme/widget/scrollbar/scrollbar_v.png:
+        * DefaultTheme/widget/search/cancel/cancel_normal_button2.png:
+        * DefaultTheme/widget/search/decoration/decoration_normal_button.png:
+        * DefaultTheme/widget/search/field/field_focused.png:
+        * DefaultTheme/widget/search/field/field_hovered.png:
+        * DefaultTheme/widget/search/field/field_normal.png:
+        * DefaultTheme/widget/slider/slider.edc:
+        * DefaultTheme/widget/slider/slider_fill_h.png: Added.
+        * DefaultTheme/widget/slider/slider_fill_v.png: Added.
+        * DefaultTheme/widget/slider/slider_h.png:
+        * DefaultTheme/widget/slider/slider_hilight.png: Removed.
+        * DefaultTheme/widget/slider/slider_knob_h.png:
+        * DefaultTheme/widget/slider/slider_knob_press_h.png: Added.
+        * DefaultTheme/widget/slider/slider_knob_press_v.png: Added.
+        * DefaultTheme/widget/slider/slider_knob_v.png:
+        * DefaultTheme/widget/slider/slider_v.png:
+
 2010-08-12  Rafael Antognolli  <antognolli@profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
index 82b6882..e9f55f0 100644 (file)
@@ -23,16 +23,16 @@ color_classes {
    color_class {
       name: "webkit/selection/active";
       color: 255 255 255 255; /* foreground */
-      color2: 32 0 200 255; /* background */
+      color2: 86 86 209 255; /* background */
    }
    color_class {
       name: "webkit/selection/inactive";
       color: 255 255 255 255; /* foreground */
-      color2: 128 0 255 128; /* background */
+      color2: 0 0 128 128; /* background */
    }
    color_class {
       name: "webkit/focus_ring";
-      color: 26 182 240 255; /* foreground */
+      color: 26 26 226 255; /* foreground */
       /* no background, consider transparent */
    }
    color_class {
index 603daa0..78cc72a 100644 (file)
             type: IMAGE;
             description {
                state: "default" 0.0;
-               min: 25 10;
+               min: 25 25;
                image {
                   normal: "widget/button/img_button_normal.png";
-                  border: 6 6 6 6;
+                  border: 6 10 8 10;
                }
             }
             description {
@@ -75,7 +75,7 @@
                inherit: "default" 0.0;
                image {
                   normal: "widget/button/img_button_press.png";
-                  border: 8 8 8 8;
+                  border: 6 10 8 10;
                }
             }
             description {
@@ -88,7 +88,7 @@
                inherit: "default" 0.0;
                image {
                   normal: "widget/button/img_button_hover.png";
-                  border: 6 6 6 6;
+                  border: 6 10 8 10;
                }
             }
             description {
@@ -96,7 +96,7 @@
                inherit: "default" 0.0;
                image {
                   normal: "widget/button/img_button_focus.png";
-                  border: 6 6 6 6;
+                  border: 6 10 8 10;
                }
             }
          }
                color: 0 0 0 0;
                rel1 {
                   relative: 0.0 0.0;
-                  offset: 10 5;
+                  offset: 15 8;
                }
                rel2 {
                   relative: 1.0 1.0;
-                  offset: -11 -6;
+                  offset: -16 -11;
                }
             }
          }
index b9395d3..9e91fe8 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png and b/WebKit/efl/DefaultTheme/widget/button/img_button_focus.png differ
index 224f966..9e91fe8 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/button/img_button_hover.png and b/WebKit/efl/DefaultTheme/widget/button/img_button_hover.png differ
index b546075..bd9dee9 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png and b/WebKit/efl/DefaultTheme/widget/button/img_button_normal.png differ
index 7434179..b8b5163 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/button/img_button_press.png and b/WebKit/efl/DefaultTheme/widget/button/img_button_press.png differ
index 86490f6..0e09303 100644 (file)
@@ -22,7 +22,7 @@
    group {
 
       name: "webkit/widget/checkbox";
-      min: 14 14;
+      min: 12 12;
 
       images {
          image: "widget/check/img_check_on.png" COMP;
@@ -71,8 +71,8 @@
             type: IMAGE;
             description {
                state: "default" 0.0;
-               min: 14 14;
-               max: 14 14;
+               min: 12 12;
+               max: 12 12;
                image {
                   normal: "widget/check/img_check_off.png";
                }
index 4353276..167fa4e 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_off.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_off.png differ
index 3d30818..18bee2a 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_off_focus.png differ
index 6f397db..18bee2a 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png differ
index 65750a7..87d13ed 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_on.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_on.png differ
index 0abf6ee..1f40566 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_on_focus.png differ
index 522c238..1f40566 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png and b/WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png differ
index 9c436cc..d101d60 100644 (file)
@@ -104,7 +104,7 @@ group {
                 min: 36 20;
                 image {
                     normal: "widget/combo/combo_normal.png";
-                    border: 7 7 7 7;
+                    border: 15 0 8 11;
                 }
             }
             description {
@@ -117,7 +117,7 @@ group {
                inherit: "default" 0.0;
                image {
                   normal: "widget/combo/combo_hover.png";
-                  border: 7 7 7 7;
+                  border: 15 0 8 11;
                }
             }
             description {
@@ -125,7 +125,7 @@ group {
                inherit: "default" 0.0;
                image {
                   normal: "widget/combo/combo_focus.png";
-                  border: 7 7 7 7;
+                  border: 15 0 8 11;
                }
             }
             description {
@@ -133,7 +133,7 @@ group {
                inherit: "default" 0.0;
                image {
                   normal: "widget/combo/combo_press.png";
-                  border: 7 7 7 7;
+                  border: 15 0 8 11;
                }
             }
         }
@@ -165,7 +165,7 @@ group {
                 rel1.to: "bt_combo_clipper";
                 image {
                      normal: "widget/combo/combo_normal_button.png";
-                     border: 3 5 5 5;
+                     border: 1 15 8 10;
                }
             }
             description {
@@ -180,7 +180,7 @@ group {
                 rel1.to: "bt_combo_clipper";
                 image {
                     normal: "widget/combo/combo_hover_button.png";
-                    border: 3 5 5 5;
+                    border: 1 15 8 10;
                 }
             }
             description {
@@ -189,7 +189,7 @@ group {
                 rel1.to: "bt_combo_clipper";
                 image {
                     normal: "widget/combo/combo_focus_button.png";
-                    border: 6 7 7 7;
+                    border: 1 15 8 10;
                 }
             }
             description {
@@ -198,7 +198,7 @@ group {
                 rel1.to: "bt_combo_clipper";
                 image {
                     normal: "widget/combo/combo_press_button.png";
-                    border: 6 8 8 8;
+                    border: 1 15 8 10;
                 }
             }
         }
@@ -210,8 +210,8 @@ group {
             clip_to: "bt_combo_clipper";
             description {
                 state: "default" 0.0;
-                min: 17 13;
-                max: 17 13;
+                min: 12 10;
+                max: 12 10;
                 color: 255 255 255 150;
                 rel1 {
                     to: "bt_combo_clipper";
@@ -247,11 +247,11 @@ group {
                color: 0 0 0 0;
                rel1 {
                   to: "combo_clipper";
-                  offset: 10 5;
+                  offset: 15 10;
                }
                rel2 {
                   to: "combo_clipper";
-                  offset: -6 -6;
+                  offset: -11 -11;
                }
             }
          }
index cfdc309..3b1574b 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png differ
index 9fc2d10..eaf137b 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png differ
index 9aaa4ee..3b1574b 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png differ
index 1f5c6b8..eaf137b 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png differ
index 9afe713..fc461a7 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png differ
index d920d90..1cbcb11 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png differ
index 4b39c70..97c88c5 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_press.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_press.png differ
index da54328..17233af 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png and b/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png differ
index 5d9fb96..1534c2c 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/icon.png and b/WebKit/efl/DefaultTheme/widget/combo/icon.png differ
index 0069d1e..f4b17a9 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/entry/img_focused.png and b/WebKit/efl/DefaultTheme/widget/entry/img_focused.png differ
index fbd07af..f4b17a9 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/entry/img_hovered.png and b/WebKit/efl/DefaultTheme/widget/entry/img_hovered.png differ
index 7c5f1cf..88d53f4 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/entry/img_normal.png and b/WebKit/efl/DefaultTheme/widget/entry/img_normal.png differ
index 55f5bb8..cc93b27 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/file/file_focus.png and b/WebKit/efl/DefaultTheme/widget/file/file_focus.png differ
index be32454..41285a1 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/file/file_hover.png and b/WebKit/efl/DefaultTheme/widget/file/file_hover.png differ
index 794eba6..a6d0653 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/file/file_normal.png and b/WebKit/efl/DefaultTheme/widget/file/file_normal.png differ
index 4471dc5..f18f8fd 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/file/file_press.png and b/WebKit/efl/DefaultTheme/widget/file/file_press.png differ
index e249d8f..cd64cd8 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_off.png differ
index b25751c..87d31e2 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_focus.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_focus.png differ
index 9096ef8..87d31e2 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png differ
index b1f4085..b8d8ecb 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_on.png differ
index a28d3dd..bf8a970 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_focus.png differ
index 3a3a35e..bf8a970 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png and b/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png differ
index 38a6da9..f07b9b2 100644 (file)
@@ -21,7 +21,7 @@
 
    group {
       name: "webkit/widget/radio";
-      min: 16 16;
+      min: 12 12;
 
       images {
          image: "widget/radio/img_radio_on.png" COMP;
@@ -70,8 +70,8 @@
             type: IMAGE;
             description {
                state: "default" 0.0;
-               min: 16 16;
-               max: 16 16;
+               min: 12 12;
+               max: 12 12;
                image {
                   normal: "widget/radio/img_radio_off.png";
                }
index 4f59784..b4eead0 100644 (file)
@@ -1,7 +1,5 @@
 /*
     Copyright (C) 2008,2009 INdT - Instituto Nokia de Tecnologia
-    Copyright (C) 2009,2010 ProFUSION embedded systems
-    Copyright (C) 2009,2010 Samsung Electronics
 
     This file is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -22,7 +20,7 @@
 group {
     name: "scrollbar.vertical";
 
-    min: 10 0; /* if > 0, this is the minimum size that will be allocated.
+    min: 0 0;  /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
 
@@ -85,20 +83,26 @@ group {
             description {
                min: 10 0;
                max: 10 999999;
+               align: 1.0 0.5;
                state: "default" 0.0;
                color: 255 255 255 0;
             }
          }
+
          part {
             name: "rect.clipper";
             type: RECT;
             description {
                state: "default" 0.0;
                color: 255 255 255 255;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
             description {
                state: "hidden" 0.0;
-               color: 255 255 255 128;
+               color: 255 255 255 64;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
          }
 
@@ -109,11 +113,31 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 1 30;
+               max: 1 999999;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_v.png";
-                  border: 0 0 6 6;
+                  border: 0 0 15 15;
+                  middle: SOLID;
                }
-           }
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
+         }
+
+         part {
+            name: "rect.knobarea";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               min: 5 5;
+               max: 5 999999;
+               align: 0.5 0.5;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
          }
 
          part {
@@ -124,15 +148,17 @@ group {
             dragable {
                 x: 0 0 0;
                 y: 1 1 0;
-                confine: "rect.base";
+                confine: "rect.knobarea";
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
-               max: 10 999999;
+               min: 5 5;
+               max: 5 999999;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_knob_v.png";
-                  border: 0 0 6 6;
+                  border: 3 3 3 3;
+                  middle: SOLID;
                }
             }
          }
@@ -171,7 +197,7 @@ group {
 group {
     name: "scrollbar.horizontal";
 
-    min: 0 10; /* if > 0, this is the minimum size that will be allocated.
+    min: 0 0;  /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
 
@@ -235,19 +261,25 @@ group {
                state: "default" 0.0;
                min: 0 10;
                max: 999999 10;
+               align: 0.5 1.0;
                color: 255 255 255 0;
             }
          }
+
          part {
             name: "rect.clipper";
             type: RECT;
             description {
                state: "default" 0.0;
                color: 255 255 255 255;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
             description {
                state: "hidden" 0.0;
-               color: 255 255 255 128;
+               color: 255 255 255 64;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
             }
          }
 
@@ -258,13 +290,34 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 30 1;
+               max: 999999 1;
+               align: 0.5 0.5;
                image {
                   normal: "widget/scrollbar/scrollbar_h.png";
-                  border: 6 6 0 0;
+                  border: 15 15 0 0;
+                  middle: SOLID;
                }
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
            }
          }
 
+
+         part {
+            name: "rect.knobarea";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               min: 5 5;
+               max: 999999 5;
+               align: 0.5 0.5;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+            }
+         }
+
          part {
             name: "img.knob";
             type: IMAGE;
@@ -273,14 +326,16 @@ group {
             dragable {
                 x: 1 1 0;
                 y: 0 0 0;
-                confine: "rect.base";
+                confine: "rect.knobarea";
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
+               min: 5 5;
+               max: 999999 5;
                image {
                   normal: "widget/scrollbar/scrollbar_knob_h.png";
-                  border: 6 6 0 0;
+                  border: 3 3 3 3;
+                  middle: SOLID;
                }
             }
          }
index 6e55557..6703ea8 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_h.png and b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_h.png differ
diff --git a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_hilight.png b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_hilight.png
deleted file mode 100644 (file)
index 1116f4e..0000000
Binary files a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_hilight.png and /dev/null differ
index bc65102..b64d5ce 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_h.png and b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_h.png differ
index db3c685..9aa37ec 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_v.png and b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_v.png differ
index 9ebdac2..364be0a 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_v.png and b/WebKit/efl/DefaultTheme/widget/scrollbar/scrollbar_v.png differ
index 5ab4f5b..3120cfb 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/search/cancel/cancel_normal_button2.png and b/WebKit/efl/DefaultTheme/widget/search/cancel/cancel_normal_button2.png differ
index 3ed2219..6e7f418 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/search/decoration/decoration_normal_button.png and b/WebKit/efl/DefaultTheme/widget/search/decoration/decoration_normal_button.png differ
index 0069d1e..f4b17a9 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/search/field/field_focused.png and b/WebKit/efl/DefaultTheme/widget/search/field/field_focused.png differ
index fbd07af..f4b17a9 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png and b/WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png differ
index 7c5f1cf..88d53f4 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/search/field/field_normal.png and b/WebKit/efl/DefaultTheme/widget/search/field/field_normal.png differ
index 6c1f6a5..9e339e5 100644 (file)
 group {
     name: "webkit/widget/slider/vertical";
 
-    min: 10 0; /* if > 0, this is the minimum size that will be allocated.
+    min: 11 0; /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
+    max: 11 999999;
 
     images {
         image: "widget/slider/slider_v.png" COMP;
         image: "widget/slider/slider_knob_v.png" COMP;
+        image: "widget/slider/slider_knob_press_v.png" COMP;
+        image: "widget/slider/slider_fill_v.png" COMP;
     }
 
     script {
-        public message(Msg_Type:type, id, ...) {
-            if ((id == 0) && (type == MSG_FLOAT_SET)) {
-                new Float:vy, Float:sy;
+       public isEnabled;
+       public isPressed;
+       public isChecked;
+       public isFocused;
+       public isHovered;
 
-                vy = getfarg(2);
-                sy = getfarg(3);
+       public show() {
 
-                if (vy >= 0.0) {
-                    set_drag_size(PART:"img.knob", 1.0, sy);
-                    set_drag(PART:"img.knob", 0.0, vy);
-                }
-            }
-        }
+           if (get_int(isEnabled) == 1) {
+               set_state(PART:"img.knob", "default", 0.0);
+               if (get_int(isFocused) == 1) {
+                   set_state(PART:"img.knob", "pressed", 0.0);
+                   if (get_int(isPressed) == 1)
+                       set_state(PART:"img.knob", "pressed", 0.0);
+                   }
+               else if (get_int(isHovered) == 1) {
+                   set_state(PART:"img.knob", "pressed", 0.0);
+                   if (get_int(isPressed) == 1)
+                       set_state(PART:"img.knob", "pressed", 0.0);
+               }
+           }
+           else
+               set_state(PART:"img.knob", "default", 0.0);
+       }
 
-        public update_drag_pos() {
-            new Float:x, Float:y;
-            get_drag(PART:"img.knob", x, y);
-            send_message(MSG_FLOAT, 1, y);
-        }
+       public message(Msg_Type:type, id, ...) {
+           if ((id == 0) && (type == MSG_FLOAT_SET)) {
+               new Float:vy, Float:sy;
+
+               vy = getfarg(2);
+               sy = getfarg(3);
+
+               if (vy >= 0.0) {
+                   set_drag_size(PART:"img.knob", 1.0, sy);
+                   set_drag(PART:"img.knob", 0.0, vy);
+                   run_program(PROGRAM:"show");
+               } else
+                   run_program(PROGRAM:"hide");
+           }
+       }
+
+       public update_drag_pos() {
+           new Float:x, Float:y;
+           get_drag(PART:"img.knob", x, y);
+           send_message(MSG_FLOAT, 1, y);
+       }
     }
 
     parts {
@@ -58,8 +88,8 @@ group {
             name: "rect.base";
             type: RECT;
             description {
-               min: 10 0;
-               max: 10 999999;
+               min: 11 29;
+               max: 11 999999;
                state: "default" 0.0;
                color: 255 255 255 0;
             }
@@ -71,6 +101,10 @@ group {
                state: "default" 0.0;
                color: 255 255 255 255;
             }
+            description {
+               state: "hidden" 0.0;
+               color: 255 255 255 128;
+            }
          }
 
          part {
@@ -80,9 +114,32 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 5 29;
+               max: 5 999999;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
                image {
                   normal: "widget/slider/slider_v.png";
-                  border: 0 0 6 6;
+                  border: 0 0 5 5;
+               }
+           }
+         }
+
+         part {
+            name: "img.slider_fill";
+            type: IMAGE;
+            mouse_events: 0;
+            clip_to: "rect.clipper";
+            description {
+               state: "default" 0.0;
+               min: 5 29;
+               max: 5 999999;
+               rel1.to: "img.knob";
+               rel2.to: "rect.base";
+               align: 0.5 0.5;
+               image {
+                  normal: "widget/slider/slider_fill_v.png";
+                  border: 0 0 5 5;
                }
            }
          }
@@ -94,22 +151,46 @@ group {
             clip_to: "rect.clipper";
             dragable {
                 x: 0 0 0;
-                y: 1 1 0;
+                y: 1 1 1;
                 confine: "rect.base";
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
-               max: 10 999999;
+               min: 11 29;
+               align: 0.5 0.5;
                image {
                   normal: "widget/slider/slider_knob_v.png";
                   border: 0 0 6 6;
                }
             }
+            description {
+               state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "widget/slider/slider_knob_press_v.png";
+            }
          }
     }
     programs {
         program {
+           name: "load";
+           signal: "load";
+           action: STATE_SET "hidden" 0.0;
+           target: "rect.clipper";
+        }
+        program {
+           name: "hide";
+           action: STATE_SET "hidden" 0.0;
+           transition: ACCELERATE 0.5;
+           target: "rect.clipper";
+        }
+
+        program {
+           name: "show";
+           action: STATE_SET "default" 0.0;
+           target: "rect.clipper";
+        }
+
+        program {
            name: "dragged";
            signal: "drag";
            source: "img.knob";
@@ -117,41 +198,124 @@ group {
               update_drag_pos();
            }
         }
+
+        program {
+           name: "enabled";
+           signal: "enabled";
+           script {
+              set_int(isEnabled, 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: "focused";
+           signal: "focused";
+           script {
+              set_int(isFocused, 1);
+              show();
+           }
+        }
+         program {
+           name: "hovered";
+           signal: "hovered";
+           script {
+              set_int(isHovered, 1);
+              show();
+           }
+        }
+        program {
+            name: "reset";
+            signal: "reset";
+            script {
+               set_int(isEnabled, 0);
+               set_int(isPressed, 0);
+               set_int(isChecked, 0);
+               set_int(isFocused, 0);
+               set_int(isHovered, 0);
+               show();
+            }
+        }
     }
 }
 
 group {
     name: "webkit/widget/slider/horizontal";
 
-    min: 0 10; /* if > 0, this is the minimum size that will be allocated.
+    min: 0 11; /* if > 0, this is the minimum size that will be allocated.
                 * If wants to draw on top, just overflow usign edje's rel1/rel2
                 */
+    max: 999999 11;
 
     images {
         image: "widget/slider/slider_h.png" COMP;
         image: "widget/slider/slider_knob_h.png" COMP;
+        image: "widget/slider/slider_knob_press_h.png" COMP;
+        image: "widget/slider/slider_fill_h.png" COMP;
     }
 
     script {
-        public message(Msg_Type:type, id, ...) {
-            if ((id == 0) && (type == MSG_FLOAT_SET)) {
-                new Float:vx, Float:sx;
+       public isEnabled;
+       public isPressed;
+       public isChecked;
+       public isFocused;
+       public isHovered;
 
-                vx = getfarg(2);
-                sx = getfarg(3);
+       public show() {
 
-                if (vx >= 0.0) {
-                    set_drag_size(PART:"img.knob", sx, 1.0);
-                    set_drag(PART:"img.knob", vx, 0.0);
-                }
-            }
-        }
+           if (get_int(isEnabled) == 1) {
+               set_state(PART:"img.knob", "default", 0.0);
+               if (get_int(isFocused) == 1) {
+                   set_state(PART:"img.knob", "pressed", 0.0);
+                   if (get_int(isPressed) == 1)
+                       set_state(PART:"img.knob", "pressed", 0.0);
+                   }
+               else if (get_int(isHovered) == 1) {
+                   set_state(PART:"img.knob", "pressed", 0.0);
+                   if (get_int(isPressed) == 1)
+                       set_state(PART:"img.knob", "pressed", 0.0);
+               }
+           }
+           else
+               set_state(PART:"img.knob", "default", 0.0);
+       }
 
-        public update_drag_pos() {
-            new Float:x, Float:y;
-            get_drag(PART:"img.knob", x, y);
-            send_message(MSG_FLOAT, 1, x);
-        }
+       public message(Msg_Type:type, id, ...) {
+           if ((id == 0) && (type == MSG_FLOAT_SET)) {
+               new Float:vx, Float:sx;
+
+               vx = getfarg(2);
+               sx = getfarg(3);
+
+               if (vx >= 0.0) {
+                   set_drag_size(PART:"img.knob", sx, 1.0);
+                   set_drag(PART:"img.knob", vx, 0.0);
+                   run_program(PROGRAM:"show");
+               } else
+                   run_program(PROGRAM:"hide");
+           }
+       }
+
+       public update_drag_pos() {
+           new Float:x, Float:y;
+           get_drag(PART:"img.knob", x, y);
+           send_message(MSG_FLOAT, 1, x);
+       }
     }
 
     parts {
@@ -160,8 +324,8 @@ group {
             type: RECT;
             description {
                state: "default" 0.0;
-               min: 0 10;
-               max: 999999 10;
+               min: 29 11;
+               max: 999999 11;
                color: 255 255 255 0;
             }
          }
@@ -172,6 +336,10 @@ group {
                state: "default" 0.0;
                color: 255 255 255 255;
             }
+            description {
+               state: "hidden" 0.0;
+               color: 255 255 255 128;
+            }
          }
 
          part {
@@ -181,9 +349,33 @@ group {
             clip_to: "rect.clipper";
             description {
                state: "default" 0.0;
+               min: 29 5;
+               max: 999999 5;
+               rel1.to: "rect.base";
+               rel2.to: "rect.base";
+               align: 0.5 0.5;
                image {
                   normal: "widget/slider/slider_h.png";
-                  border: 6 6 0 0;
+                  border: 5 5 0 0;
+               }
+           }
+         }
+
+         part {
+            name: "img.slider_fill";
+            type: IMAGE;
+            mouse_events: 0;
+            clip_to: "rect.clipper";
+            description {
+               state: "default" 0.0;
+               min: 29 5;
+               max: 999999 5;
+               rel1.to: "rect.base";
+               rel2.to: "img.knob";
+               align: 0.5 0.5;
+               image {
+                  normal: "widget/slider/slider_fill_h.png";
+                  border: 5 5 0 0;
                }
            }
          }
@@ -200,16 +392,41 @@ group {
             }
             description {
                state: "default" 0.0;
-               min: 10 10;
+               min: 29 11;
+               align: 0.5 0.5;
                image {
                   normal: "widget/slider/slider_knob_h.png";
                   border: 6 6 0 0;
                }
             }
+            description {
+               state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "widget/slider/slider_knob_press_h.png";
+            }
          }
     }
     programs {
         program {
+           name: "load";
+           signal: "load";
+           action: STATE_SET "hidden" 0.0;
+           target: "rect.clipper";
+        }
+        program {
+           name: "hide";
+           action: STATE_SET "hidden" 0.0;
+           transition: ACCELERATE 0.5;
+           target: "rect.clipper";
+        }
+
+        program {
+           name: "show";
+           action: STATE_SET "default" 0.0;
+           target: "rect.clipper";
+        }
+
+        program {
            name: "dragged";
            signal: "drag";
            source: "img.knob";
@@ -217,5 +434,58 @@ group {
               update_drag_pos();
            }
         }
+
+        program {
+           name: "enabled";
+           signal: "enabled";
+           script {
+              set_int(isEnabled, 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: "focused";
+           signal: "focused";
+           script {
+              set_int(isFocused, 1);
+              show();
+           }
+        }
+         program {
+           name: "hovered";
+           signal: "hovered";
+           script {
+              set_int(isHovered, 1);
+              show();
+           }
+        }
+        program {
+            name: "reset";
+            signal: "reset";
+            script {
+               set_int(isEnabled, 0);
+               set_int(isPressed, 0);
+               set_int(isChecked, 0);
+               set_int(isFocused, 0);
+               set_int(isHovered, 0);
+               show();
+            }
+        }
     }
 }
diff --git a/WebKit/efl/DefaultTheme/widget/slider/slider_fill_h.png b/WebKit/efl/DefaultTheme/widget/slider/slider_fill_h.png
new file mode 100644 (file)
index 0000000..abe9d2c
Binary files /dev/null and b/WebKit/efl/DefaultTheme/widget/slider/slider_fill_h.png differ
diff --git a/WebKit/efl/DefaultTheme/widget/slider/slider_fill_v.png b/WebKit/efl/DefaultTheme/widget/slider/slider_fill_v.png
new file mode 100644 (file)
index 0000000..5184cad
Binary files /dev/null and b/WebKit/efl/DefaultTheme/widget/slider/slider_fill_v.png differ
index 6e55557..befd4a0 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_h.png and b/WebKit/efl/DefaultTheme/widget/slider/slider_h.png differ
diff --git a/WebKit/efl/DefaultTheme/widget/slider/slider_hilight.png b/WebKit/efl/DefaultTheme/widget/slider/slider_hilight.png
deleted file mode 100644 (file)
index 1116f4e..0000000
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_hilight.png and /dev/null differ
index bc65102..22454af 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_knob_h.png and b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_h.png differ
diff --git a/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_h.png b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_h.png
new file mode 100644 (file)
index 0000000..1421cd8
Binary files /dev/null and b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_h.png differ
diff --git a/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_v.png b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_v.png
new file mode 100644 (file)
index 0000000..293813c
Binary files /dev/null and b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_press_v.png differ
index db3c685..051f3c3 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_knob_v.png and b/WebKit/efl/DefaultTheme/widget/slider/slider_knob_v.png differ
index 9ebdac2..7243929 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_v.png and b/WebKit/efl/DefaultTheme/widget/slider/slider_v.png differ