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 f6cf1d0349b2a2f76dd393017859c33efdba9ea7..f12f94cc86637315284f0f4823322a98f7484d36 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 82b688206e092857173369ab2c72e2a3f82c064d..e9f55f0fd8c4c8b13d7d1c1767f6549b7fc962d7 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 603daa0072bf6cde501a7db508199a6e452dbd16..78cc72a544c8b395ce44a0dd9dce75a41822550a 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 b9395d3ae034fe151bbf25b5ec658de10d3a7cab..9e91fe8f96e6c3dd9c5b084f5415f11c41ef395e 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 224f9667703090348379463cb7e6c1e2cb4e0031..9e91fe8f96e6c3dd9c5b084f5415f11c41ef395e 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 b5460752a52a1184491a31dc6dabc10b43576b30..bd9dee99e91df4181601aaed73acfc27d450def2 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 7434179c06db7be280ecadc49c5f0ecf9d95cfaa..b8b5163de636b76f15aa8e413a0cefff13c0cdbc 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 86490f6ce8fc6b7f51897ccf97fc8ffafdf5d26d..0e093034c3e8f6577226e420314883ab177e8b6a 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 4353276203af96dd9950d9917cf72eeee83108d3..167fa4e0a286bb7cf3fdccfef41ba07594e71c21 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 3d30818bb282fafcb3b701cd796a1b24585dd4c9..18bee2a65970118079be7d0dd3c1412f936686e4 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 6f397db448613fb9c0e8bfd24584d88b428bc100..18bee2a65970118079be7d0dd3c1412f936686e4 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 65750a7e32869bdca02b3ab2086b0296c8329205..87d13edc8af308ab2ecfa511f07516e6d6c606d2 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 0abf6ee37811c5f12d3466c17d67dcecc1019465..1f40566d0f60996c6fad542943fd96d3e60ceede 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 522c238b599b27c357676e7591c3bdaf888bcf73..1f40566d0f60996c6fad542943fd96d3e60ceede 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 9c436ccca0d09b6d056ba9db7468851ca1e0f594..d101d602d853d0b5358936987eee73b204e5be51 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 cfdc30976b3a71ad6f3ee353265693feeddf86d7..3b1574bea1a2f9d96e6fec3437ff671be3501527 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 9fc2d10b0ebdb77d6f53f54a031486de54833903..eaf137b0ace12429d7f94a8d22e2ce4f4de5f667 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 9aaa4ee1a583041d58e771e2ac53aafe264b1e78..3b1574bea1a2f9d96e6fec3437ff671be3501527 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 1f5c6b895390bce8d937c03a89d08495fbcc0a3f..eaf137b0ace12429d7f94a8d22e2ce4f4de5f667 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 9afe713e88339539904115c274910bc3c4aacd47..fc461a7a1816f06d25ea64a54226284da451669f 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 d920d90e8bb09ad7d75917abe5b8027888ff8377..1cbcb11dcd0f9b6a6920d89c602b7f5bc6025736 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 4b39c706788b01603a9a8e36747e08bbc226187f..97c88c5ea86d8afcc3e34bd28caf2f69d303a436 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 da543288f6f197f1baad1fa8a5bfbb38a5c6285f..17233afe39103972c084772c94b2465949764001 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 5d9fb96e861f48525b84899b8d3367ec4511c32c..1534c2cbbdbbb4a99fc8d26aa31ab229b07da847 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/combo/icon.png and b/WebKit/efl/DefaultTheme/widget/combo/icon.png differ
index 0069d1ee74cf59958a1eb1d462e298c996254f4c..f4b17a94833582f192890a6714ad5235348c15c6 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 fbd07af7be2e9fea6478f7c93e76ffc2b783c002..f4b17a94833582f192890a6714ad5235348c15c6 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 7c5f1cf113475fcc28169fc525a0d667e776040f..88d53f4b44350ad701b76b7b7b5e672bb8c42486 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 55f5bb86c221780fb040434e07673b51c813a91d..cc93b272bbd4f0c95bd69dd6ce04d77a3045df38 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 be32454a71d31de88a1dfe81c364002aaaae42d7..41285a16b354cd3fca23c0cbb67f4ef7c2d3d05f 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 794eba62d7b8fb1d87d0d71d1e51bf01eb466bd5..a6d0653ef30abb19d995b4d7d855e90b5d867944 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 4471dc5933844ff3ace830fe117bb65d97c19521..f18f8fd153eff0ffdf4c110113956572d4396c36 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 e249d8fe3ed5121df7c475c7bf3308dddb9fa3be..cd64cd84e8136841ded79fc5629c1b236fa8e79b 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 b25751cf6c79ebb436098a570347faa27cb87319..87d31e2b626f3162970cf3441ca3160ed3762ad7 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 9096ef8ee5ecb3a29d17a824835cb41f3bfba012..87d31e2b626f3162970cf3441ca3160ed3762ad7 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 b1f4085934ddf6ded1f493a17a727ecd5b5d0229..b8d8ecbca259cb865d2e01c747b5287ab54b9b9e 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 a28d3dd0d70891ecb9582e4ee64aa48f08740526..bf8a9703c85731041e0dff82b22b0dd1e3a56e91 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 3a3a35e4b48d203a7a922c84e66908867bf93973..bf8a9703c85731041e0dff82b22b0dd1e3a56e91 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 38a6da9e3f9d6f33972264bc38ea88e3e4970e84..f07b9b27ec244baf4b50e6af0e6152dca809a01d 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 4f59784f02d7efe127cde76faf7dd9369be0071b..b4eead029328f26a4fdc8d952a500e679e5db554 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 6e55557451a2ced81dcb964c4707e93dec5145d4..6703ea8d0509a4556522f6f8bef0afcbea624aca 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 bc65102385c9e33ccc417dd2d11aaeef0ab0353d..b64d5ce56f7cc5cd2e6be2d1682ae048e805f73c 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 db3c685b1d628064ebf2dcc168ae252911d57fc5..9aa37eca42d23da57994bb38d46a9f3a88c156fa 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 9ebdac27b528fc3dd0802a50865cb6d0438d9465..364be0afbc4a3964313caec7c6c9ad96c773bef6 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 5ab4f5b4a1e7af2c9651df1784f4806e58c31d28..3120cfbaa06b845cfe8948e12daa95c6e3a1c4bb 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 3ed2219ef7b946acb836adf747d8e7fe62351922..6e7f4185b63716154fc02489ee1c75fd50d6973f 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 0069d1ee74cf59958a1eb1d462e298c996254f4c..f4b17a94833582f192890a6714ad5235348c15c6 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 fbd07af7be2e9fea6478f7c93e76ffc2b783c002..f4b17a94833582f192890a6714ad5235348c15c6 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 7c5f1cf113475fcc28169fc525a0d667e776040f..88d53f4b44350ad701b76b7b7b5e672bb8c42486 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 6c1f6a5d8095ae010f4380764ac6953654980e2c..9e339e543f4edc37bdccc3b5ca650ba97e4785e0 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,21 +151,45 @@ 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";
@@ -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,15 +392,40 @@ 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";
@@ -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 6e55557451a2ced81dcb964c4707e93dec5145d4..befd4a04230e10a4086dc634fd5a5cac5cba1cd6 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 bc65102385c9e33ccc417dd2d11aaeef0ab0353d..22454af723e60ac66f465edd24f1abc6e4567e56 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 db3c685b1d628064ebf2dcc168ae252911d57fc5..051f3c33ce52f42902b2a6c24886795028b9be00 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 9ebdac27b528fc3dd0802a50865cb6d0438d9465..7243929d6a5e4206edc96bb4d4f5b8eb63bd100e 100644 (file)
Binary files a/WebKit/efl/DefaultTheme/widget/slider/slider_v.png and b/WebKit/efl/DefaultTheme/widget/slider/slider_v.png differ