From: Kim Byung Jun Date: Fri, 4 Oct 2013 00:53:06 +0000 (+0900) Subject: Delete hover_state in all theme. X-Git-Tag: 2.2.1_release~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd8bf97636549bd955e711d1cb6d8779aadeed0f;p=framework%2Fweb%2Fwebkit-efl.git Delete hover_state in all theme. [Title] Delete hover_state in all theme. [Issue] N/A [Problem] Hover state cause many problem on mobile. [Cause] N/A [Solution] Delete hover part from *.edc. And delete hover image. Change-Id: Ie0df1d7f1677bac90b3f4e914285e2e9fe6db0f3 --- diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt index 2cc3f8e..ed70af8 100644 --- a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt +++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt @@ -13,34 +13,26 @@ ADD_CUSTOM_COMMAND( default.edc widget/button/button.edc widget/button/img_button_focus.png - widget/button/img_button_hover.png widget/button/img_button_normal.png widget/button/img_button_press.png widget/check/check.edc widget/check/img_check_off_focus.png - widget/check/img_check_off_hover.png widget/check/img_check_off.png widget/check/img_check_on_focus.png - widget/check/img_check_on_hover.png widget/check/img_check_on.png widget/combo/combo.edc widget/combo/00_combo_focus_button.png widget/combo/00_combo_focus.png - widget/combo/00_combo_hover_button.png - widget/combo/00_combo_hover.png widget/combo/00_combo_normal_button.png widget/combo/00_combo_normal.png widget/combo/00_combo_border.png widget/combo/00_combo_focus_border.png - widget/combo/00_combo_hover_border.png widget/combo/00_icon.png widget/entry/entry.edc widget/entry/img_focused.png - widget/entry/img_hovered.png widget/entry/img_normal.png widget/file/file.edc widget/file/file_focus.png - widget/file/file_hover.png widget/file/file_normal.png widget/file/file_press.png # widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png @@ -66,10 +58,8 @@ ADD_CUSTOM_COMMAND( widget/progressbar/progressbar.edc widget/progressbar/shelf_inset.png widget/radio/img_radio_off_focus.png - widget/radio/img_radio_off_hover.png widget/radio/img_radio_off.png widget/radio/img_radio_on_focus.png - widget/radio/img_radio_on_hover.png widget/radio/img_radio_on.png widget/radio/radio.edc widget/scrollbar/scrollbar.edc @@ -83,7 +73,6 @@ ADD_CUSTOM_COMMAND( widget/search/decoration/decoration_normal_button.png widget/search/decoration/search_decoration.edc widget/search/field/field_focused.png - widget/search/field/field_hovered.png widget/search/field/field_normal.png widget/search/field/search_field.edc widget/slider/slider.edc @@ -97,11 +86,9 @@ ADD_CUSTOM_COMMAND( # widget/slider/slider_v.png widget/spinner/sp_bg.png widget/spinner/sp_down_default.png - widget/spinner/sp_down_hover.png widget/spinner/sp_down_pressed.png widget/spinner/spinner.edc widget/spinner/sp_up_default.png - widget/spinner/sp_up_hover.png widget/spinner/sp_up_pressed.png WORKING_DIRECTORY ${DefaultTheme_DIR} VERBATIM diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc index f87ad33..7790877 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc @@ -25,7 +25,6 @@ images { image: "widget/button/img_button_normal.png" COMP; image: "widget/button/img_button_press.png" COMP; - image: "widget/button/img_button_hover.png" COMP; image: "widget/button/img_button_focus.png" COMP; } @@ -34,7 +33,6 @@ public isPressed; public isChecked; public isFocused; - public isHovered; public show() { @@ -45,8 +43,6 @@ if (get_int(isPressed) == 1) set_state(PART:"button", "pressed", 0.0); } - else if (get_int(isHovered) == 1) { - set_state(PART:"button", "hovered", 0.0); if (get_int(isPressed) == 1) set_state(PART:"button", "pressed", 0.0); @@ -84,14 +80,6 @@ color: 255 255 255 150; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/button/img_button_hover.png"; - border: 2 2 2 2; - } - } - description { state: "focused" 0.0; inherit: "default" 0.0; image { @@ -152,14 +140,6 @@ show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -168,7 +148,6 @@ set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_hover.png b/Source/WebKit/efl/DefaultTheme/widget/button/img_button_hover.png deleted file mode 100644 index 5a272a5..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/button/img_button_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/check.edc b/Source/WebKit/efl/DefaultTheme/widget/check/check.edc index 0f8d43c..e66e8fb 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/check/check.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/check/check.edc @@ -31,8 +31,6 @@ image: "widget/check/img_check_off.png" COMP; image: "widget/check/img_check_off_focus.png" COMP; image: "widget/check/img_check_on_focus.png" COMP; - image: "widget/check/img_check_off_hover.png" COMP; - image: "widget/check/img_check_on_hover.png" COMP; } script { @@ -40,7 +38,6 @@ public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -50,14 +47,10 @@ set_state(PART:"check_button", "enabled_checked", 0.0); if (get_int(isFocused) == 1) set_state(PART:"check_button", "focus_checked", 0.0); - if (get_int(isHovered) == 1 && get_int(isFocused) == 0) - set_state(PART:"check_button", "hovered_checked", 0.0); } else { if (get_int(isFocused) == 1) set_state(PART:"check_button", "focused", 0.0); - if (get_int(isHovered) == 1 && get_int(isFocused) == 0) - set_state(PART:"check_button", "hovered", 0.0); } } else { @@ -122,20 +115,6 @@ color: 255 255 255 150; } description { - state: "hovered_checked" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/check/img_check_on_hover.png"; - } - } - description { - state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/check/img_check_off_hover.png"; - } - } - description { state: "focus_checked" 0.0; inherit: "default" 0.0; image { @@ -184,14 +163,6 @@ show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -200,7 +171,6 @@ set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png deleted file mode 100644 index 18bee2a..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_off_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png b/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png deleted file mode 100644 index 1f40566..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/check/img_check_on_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png deleted file mode 100644 index 9308051..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png deleted file mode 100644 index f486bcb..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png deleted file mode 100644 index b13d63d..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo.edc b/Source/WebKit/efl/DefaultTheme/widget/combo/combo.edc index fee60f7..4e03505 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/combo/combo.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/combo/combo.edc @@ -25,20 +25,16 @@ group { name: "webkit/widget/combo"; images { image: "widget/combo/00_combo_normal.png" COMP; image: "widget/combo/00_combo_normal_button.png" COMP; - image: "widget/combo/00_combo_hover.png" COMP; - image: "widget/combo/00_combo_hover_button.png" COMP; image: "widget/combo/00_combo_focus.png" COMP; image: "widget/combo/00_combo_focus_button.png" COMP; image: "widget/combo/00_combo_border.png" COMP; image: "widget/combo/00_combo_focus_border.png" COMP; - image: "widget/combo/00_combo_hover_border.png" COMP; image: "widget/combo/00_icon.png" COMP; } script { public isEnabled; public isFocused; - public isHovered; public isStyled; public show() { @@ -53,16 +49,6 @@ group { name: "webkit/widget/combo"; set_state(PART:"combo_button", "focused", 0.0); } } - else if (get_int(isHovered) == 1) { - if (get_int(isStyled) == 1) { - set_state(PART:"combo", "styled_hovered", 0.0); - set_state(PART:"combo_button", "hovered", 0.0); - } - else { - set_state(PART:"combo", "hovered", 0.0); - set_state(PART:"combo_button", "hovered", 0.0); - } - } else if (get_int(isStyled) == 1) { set_state(PART:"combo", "styled", 0.0); set_state(PART:"combo_button", "default", 0.0); @@ -122,14 +108,6 @@ group { name: "webkit/widget/combo"; color: 255 255 255 150; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/combo/00_combo_hover.png"; - border: 15 0 15 15; - } - } - description { state: "focused" 0.0; inherit: "default" 0.0; image { @@ -151,13 +129,6 @@ group { name: "webkit/widget/combo"; border: 15 0 15 15; } } - description { - state: "styled_hovered" 0.0; - image { - normal: "widget/combo/00_combo_hover_border.png"; - border: 15 0 15 15; - } - } } part { @@ -196,15 +167,6 @@ group { name: "webkit/widget/combo"; rel1.to: "bt_combo_clipper"; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - rel1.to: "bt_combo_clipper"; - image { - normal: "widget/combo/00_combo_hover_button.png"; - border: 0 15 15 15; - } - } - description { state: "focused" 0.0; inherit: "default" 0.0; rel1.to: "bt_combo_clipper"; @@ -278,14 +240,6 @@ group { name: "webkit/widget/combo"; } } program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } - program { name: "styled_state"; signal: "bg_styled"; script { @@ -299,7 +253,6 @@ group { name: "webkit/widget/combo"; script { set_int(isEnabled, 0); set_int(isFocused, 0); - set_int(isHovered, 0); set_int(isStyled, 0); show(); } diff --git a/Source/WebKit/efl/DefaultTheme/widget/entry/entry.edc b/Source/WebKit/efl/DefaultTheme/widget/entry/entry.edc index 613ee59..0525f56 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/entry/entry.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/entry/entry.edc @@ -25,7 +25,6 @@ images { image: "widget/entry/img_normal.png" COMP; image: "widget/entry/img_focused.png" COMP; - image: "widget/entry/img_hovered.png" COMP; } script { @@ -33,7 +32,6 @@ public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -42,8 +40,6 @@ set_state(PART:"entry", "pressed", 0.0); if (get_int(isFocused) == 1) set_state(PART:"entry", "focused", 0.0); - if (get_int(isHovered) == 1 && get_int(isFocused) == 0) - set_state(PART:"entry", "hovered", 0.0); } else set_state(PART:"entry", "disabled", 0.0); @@ -88,14 +84,6 @@ state: "pressed" 0.0; inherit: "focused" 0.0; } - description { - state: "hovered" 0.0; - inherit: "focused" 0.0; - image { - normal: "widget/entry/img_hovered.png"; - border: 7 7 7 7; - } - } } part { @@ -143,14 +131,6 @@ show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -159,7 +139,6 @@ set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/entry/img_hovered.png b/Source/WebKit/efl/DefaultTheme/widget/entry/img_hovered.png deleted file mode 100644 index f4b17a9..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/entry/img_hovered.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/file/file.edc b/Source/WebKit/efl/DefaultTheme/widget/file/file.edc index 40afcc7..08d8c46 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/file/file.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/file/file.edc @@ -24,7 +24,6 @@ group { images { image: "widget/file/file_normal.png" COMP; - image: "widget/file/file_hover.png" COMP; image: "widget/file/file_focus.png" COMP; image: "widget/file/file_press.png" COMP; } @@ -34,7 +33,6 @@ group { public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -44,12 +42,6 @@ group { if (get_int(isPressed) == 1) set_state(PART:"file", "pressed", 0.0); } - else if (get_int(isHovered) == 1) { - set_state(PART:"file", "hovered", 0.0); - if (get_int(isPressed) == 1) - set_state(PART:"file", "pressed", 0.0); - - } } else set_state(PART:"file", "disabled", 0.0); @@ -73,14 +65,6 @@ group { color: 255 255 255 150; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/file/file_hover.png"; - border: 8 8 8 8; - } - } - description { state: "focused" 0.0; inherit: "default" 0.0; image { @@ -124,14 +108,6 @@ group { show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -140,7 +116,6 @@ group { set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/file/file_hover.png b/Source/WebKit/efl/DefaultTheme/widget/file/file_hover.png deleted file mode 100644 index 41285a1..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/file/file_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png deleted file mode 100644 index 87d31e2..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_off_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png b/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png deleted file mode 100644 index bf8a970..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/radio/img_radio_on_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc b/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc index ec01463..06d7c27 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/radio/radio.edc @@ -30,8 +30,6 @@ image: "widget/radio/img_radio_off.png" COMP; image: "widget/radio/img_radio_on_focus.png" COMP; image: "widget/radio/img_radio_off_focus.png" COMP; - image: "widget/radio/img_radio_on_hover.png" COMP; - image: "widget/radio/img_radio_off_hover.png" COMP; } script { @@ -39,7 +37,6 @@ public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -49,14 +46,10 @@ set_state(PART:"radio_button", "enabled_checked", 0.0); if (get_int(isFocused) == 1) set_state(PART:"radio_button", "focus_checked", 0.0); - if (get_int(isHovered) == 1 && get_int(isFocused) == 0) - set_state(PART:"radio_button", "hovered_checked", 0.0); } else { if (get_int(isFocused) == 1) set_state(PART:"radio_button", "focused", 0.0); - if (get_int(isHovered) == 1 && get_int(isFocused) == 0) - set_state(PART:"radio_button", "hovered", 0.0); } } else { @@ -121,20 +114,6 @@ color: 255 255 255 150; } description { - state: "hovered_checked" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/radio/img_radio_on_hover.png"; - } - } - description { - state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "widget/radio/img_radio_off_hover.png"; - } - } - description { state: "focus_checked" 0.0; inherit: "default" 0.0; image { @@ -184,14 +163,6 @@ show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -200,7 +171,6 @@ set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/search/cancel/search_cancel.edc b/Source/WebKit/efl/DefaultTheme/widget/search/cancel/search_cancel.edc index d4a1a20..b462f11 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/search/cancel/search_cancel.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/search/cancel/search_cancel.edc @@ -32,7 +32,6 @@ group { public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -41,8 +40,6 @@ group { set_state(PART:"cancel_button", "focused", 0.0); if (get_int(isPressed) == 1) set_state(PART:"cancel_button", "pressed", 0.0); - if (get_int(isHovered) == 1) - set_state(PART:"cancel_button", "hovered", 0.0); } else set_state(PART:"cancel_button", "disabled", 0.0); @@ -68,10 +65,6 @@ group { color: 255 255 255 150; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - } - description { state: "focused" 0.0; inherit: "default" 0.0; } @@ -108,14 +101,6 @@ group { } } program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } - program { name: "reset"; signal: "reset"; script { @@ -123,7 +108,6 @@ group { set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/search/decoration/search_decoration.edc b/Source/WebKit/efl/DefaultTheme/widget/search/decoration/search_decoration.edc index 4159138..09e2169 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/search/decoration/search_decoration.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/search/decoration/search_decoration.edc @@ -32,7 +32,6 @@ group { public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -41,8 +40,6 @@ group { set_state(PART:"decoration", "focused", 0.0); if (get_int(isPressed) == 1) set_state(PART:"decoration", "pressed", 0.0); - if (get_int(isHovered) == 1) - set_state(PART:"decoration", "hovered", 0.0); } else set_state(PART:"decoration", "disabled", 0.0); @@ -69,10 +66,6 @@ group { color: 255 255 255 150; } description { - state: "hovered" 0.0; - inherit: "default" 0.0; - } - description { state: "focused" 0.0; inherit: "default" 0.0; } @@ -109,14 +102,6 @@ group { } } program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } - program { name: "reset"; signal: "reset"; script { @@ -124,7 +109,6 @@ group { set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png b/Source/WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png deleted file mode 100644 index f4b17a9..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/search/field/field_hovered.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/search/field/search_field.edc b/Source/WebKit/efl/DefaultTheme/widget/search/field/search_field.edc index e9be229..5a03404 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/search/field/search_field.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/search/field/search_field.edc @@ -25,7 +25,6 @@ group { images { image: "widget/search/field/field_normal.png" COMP; image: "widget/search/field/field_focused.png" COMP; - image: "widget/search/field/field_hovered.png" COMP; } script { @@ -33,7 +32,6 @@ group { public isPressed; public isChecked; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -42,8 +40,6 @@ group { set_state(PART:"search_field", "focused", 0.0); if (get_int(isPressed) == 1) set_state(PART:"search_field", "pressed", 0.0); - if (get_int(isFocused) == 0 && get_int(isHovered) == 1) - set_state(PART:"search_field", "hovered", 0.0); } else set_state(PART:"search_field", "disabled", 0.0); @@ -76,14 +72,6 @@ group { } } description { - state: "hovered" 0.0; - inherit: "focused" 0.0; - image { - normal: "widget/search/field/field_hovered.png"; - border: 8 8 8 8; - } - } - description { state: "pressed" 0.0; inherit: "focused" 0.0; } @@ -127,14 +115,6 @@ group { show(); } } - program { - name: "hovered"; - signal: "hovered"; - script { - set_int(isHovered, 1); - show(); - } - } program { name: "reset"; signal: "reset"; @@ -143,7 +123,6 @@ group { set_int(isPressed, 0); set_int(isChecked, 0); set_int(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/slider/slider.edc b/Source/WebKit/efl/DefaultTheme/widget/slider/slider.edc index 2308a7d..405ffa0 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/slider/slider.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/slider/slider.edc @@ -35,7 +35,6 @@ group { public isEnabled; public isPressed; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -44,10 +43,6 @@ group { set_state(PART:"img.thumb", "pressed", 0.0); if (get_int(isPressed) == 1) set_state(PART:"img.thumb", "pressed", 0.0); - } else if (get_int(isHovered) == 1) { - set_state(PART:"img.thumb", "pressed", 0.0); - if (get_int(isPressed) == 1) - set_state(PART:"img.thumb", "pressed", 0.0); } } else set_state(PART:"img.thumb", "default", 0.0); @@ -104,22 +99,12 @@ group { } 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(isFocused, 0); - set_int(isHovered, 0); show(); } } @@ -236,7 +221,6 @@ group { public isEnabled; public isPressed; public isFocused; - public isHovered; public show() { if (get_int(isEnabled) == 1) { @@ -245,10 +229,6 @@ group { set_state(PART:"img.thumb", "pressed", 0.0); if (get_int(isPressed) == 1) set_state(PART:"img.thumb", "pressed", 0.0); - } else if (get_int(isHovered) == 1) { - set_state(PART:"img.thumb", "pressed", 0.0); - if (get_int(isPressed) == 1) - set_state(PART:"img.thumb", "pressed", 0.0); } } else set_state(PART:"img.thumb", "default", 0.0); @@ -305,22 +285,12 @@ group { } 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(isFocused, 0); - set_int(isHovered, 0); show(); } } diff --git a/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_down_hover.png b/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_down_hover.png deleted file mode 100644 index a1c4f3f..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_down_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_up_hover.png b/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_up_hover.png deleted file mode 100644 index 000ffd1..0000000 Binary files a/Source/WebKit/efl/DefaultTheme/widget/spinner/sp_up_hover.png and /dev/null differ diff --git a/Source/WebKit/efl/DefaultTheme/widget/spinner/spinner.edc b/Source/WebKit/efl/DefaultTheme/widget/spinner/spinner.edc index c3f9078..a1ffef1 100644 --- a/Source/WebKit/efl/DefaultTheme/widget/spinner/spinner.edc +++ b/Source/WebKit/efl/DefaultTheme/widget/spinner/spinner.edc @@ -25,8 +25,6 @@ group { image: "widget/spinner/sp_down_default.png" COMP; image: "widget/spinner/sp_up_pressed.png" COMP; image: "widget/spinner/sp_down_pressed.png" COMP; - image: "widget/spinner/sp_up_hover.png" COMP; - image: "widget/spinner/sp_down_hover.png" COMP; } script {