raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=1ac4e844b242fa0d2b143e412434bf50420a142c
commit 1ac4e844b242fa0d2b143e412434bf50420a142c Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun Apr 26 13:21:40 2020 +0100 TH combobox --- data/elementary/themes/edc/elm/button.edc | 292 ++++++------------------------ data/elementary/themes/edc/elm/entry.edc | 4 +- data/elementary/themes/edc/elm/hover.edc | 35 ++-- 3 files changed, 83 insertions(+), 248 deletions(-) diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index f27681c018..9c83b95665 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -1107,6 +1107,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; } } rect { "select_line"; nomouse; + scale: 1; desc { "default"; fixed: 1 1; align: 1.0 0.5; @@ -1456,38 +1457,33 @@ IC("ic-arrow-d", "arrow-d") /******************* SPINNER BUTTONS STYLES END **********************/ group { name: "elm/button/base/combobox_vertical/default"; alias: "elm/button/base/combobox_vertical/entry"; - alias: "elm/button/base/combobox_horizontal/default"; - alias: "elm/button/base/combobox_horizontal/entry"; - - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "vertical_separated_bar_glow.png" COMP; - images.image: "vertical_separated_bar_disabled.png" COMP; + images.image: "win_shadow.png" COMP; parts { - image { "base"; nomouse; - desc { "default"; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -1 0; - rel2.offset: 0 1; - fill.smooth: 0; - } - desc { "clicked"; - inherit: "default"; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; + part { name: "shadow"; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel.to: "base"; + WIN_SHADOW_SMALL; } } - rect { "icon_clip"; + rect { "base"; + scale: 1; desc { "default"; + color: 96 96 96 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; + } + desc { "pressed"; + inherit; + color: 128 128 128 255; } desc { "disabled"; - inherit: "default"; - color: 255 255 255 180; + inherit; + color: 72 72 72 255; } } - rect { "event"; + rect { name: "event"; desc { "default"; color: 0 0 0 0; } @@ -1497,266 +1493,98 @@ group { name: "elm/button/base/combobox_vertical/default"; } } swallow { "elm.swallow.content"; - clip_to: "icon_clip"; + scale: 1; desc { "default"; - fixed: 0 0; - align: 0.5 0.5; - rel1.offset: 6 5; - rel1.to: "base"; + rel.to: "base"; + rel1.offset: 4 4; + rel2.to_x: "select_line"; rel2.relative: 0.0 1.0; - rel2.offset: -3 -8; - rel2.to: "select_line"; - visible: 1; + rel2.offset: -5 -5; + offscale; } } - image { "select_line"; nomouse; + rect { name: "event2"; desc { "default"; - fixed: 1 1; + color: 0 0 0 0; + rel.to: "base"; align: 1.0 0.5; - min: 15 10; - rel1.to: "base"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 -3; - rel2.to: "base"; - rel2.offset: 1 0; - image.normal: "vertical_separated_bar_glow.png"; - image.border: 7 7 7 7; - fill.smooth : 0; - } - desc { "clicked"; - inherit: "default"; - rel1.offset: 0 -2; - rel2.offset: 0 -1; + aspect: 1.0 1.0; aspect_preference: VERTICAL; } desc { "disabled"; inherit: "default"; - image.normal: "vertical_separated_bar_disabled.png"; - } - } - } - programs { - program { - signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; - after: "button_click_anim"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "base"; - target: "select_line"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; - after: "button_unclick_anim"; - } - program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "select_line"; - } - program { name: "buttonactivate"; - signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "clicked" 0.0; - target: "base"; - target: "select_line"; - after: "button_unpressed_anim"; - } - program { name: "button_unpressed_anim"; - action: STATE_SET "default" 0.0; - in: 0.5 0.0; - target: "base"; - target: "select_line"; - } - program { - signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; - } - program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "icon_clip"; - target: "event"; - target: "select_line"; - } - program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "icon_clip"; - target: "event"; - target: "select_line"; - } - } -} - -group { name: "elm/button/base/combobox_vertical_entry/default"; - alias: "elm/button/base/combobox_vertical_entry/entry"; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_horiz_out.png" COMP; - images.image: "shadow_rounded_horiz.png" COMP; - images.image: "shine.png" COMP; - - parts { - image { "shadow"; nomouse; - desc { "default"; - fixed: 1 1; - image.normal: "shadow_rounded_horiz.png"; - image.border: 0 0 9 9; - rel1.to: "base"; - rel1.offset: 0 -4; - rel2.to: "base"; - rel2.offset: -1 5; - fill.smooth: 0; - visible: 0; - } - desc { "clicked"; - inherit: "default"; - visible: 1; - } - } - image { "base"; nomouse; - desc { "default"; - fixed: 1 1; - rel1.offset: -6 0; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) visible: 0; } - desc { "clicked"; - inherit: "default"; - visible: 1; - } } - rect { "icon_clip"; - desc { "default"; - } - desc { "disabled"; - inherit: "default"; - color: 255 255 255 64; - } - } - image { "bevel"; nomouse; + rect { "select_line"; nomouse; + scale: 1; desc { "default"; fixed: 1 1; - image.normal: "bevel_horiz_out.png"; - image.border: 0 0 2 2; - image.middle: 0; - fill.smooth: 0; - visible: 0; + align: 1.0 0.5; + min: 5 5; + rel.to: "base"; + rel1.relative: 1.0 0.0; + rel1.offset: -1 0; + rel2.offset: -1 -1; + color: 51 153 255 255; } - desc { "clicked"; + desc { "pressed"; inherit: "default"; - visible: 1; - } - } - image { "shine"; nomouse; - desc { "default"; - fixed: 1 1; - rel1.to: "base"; - rel1.offset: 0 -2; - rel2.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - image.normal: "shine.png"; - visible: 0; - FIXED_SIZE(69, 5) - } - desc { "clicked"; - inherit: "default"; - visible: 1; - } - } - rect { name: "event"; - desc { "default"; - color: 0 0 0 0; + color: 255 255 255 255; } desc { "disabled"; inherit: "default"; - visible: 0; - } - } - swallow { "elm.swallow.content"; nomouse; - clip_to: "icon_clip"; - desc { "default"; - fixed: 1 0; - align: 0.0 0.5; - rel1.offset: 6 5; - rel1.to: "base"; - rel2.relative: 0.0 1.0; - rel2.offset: 6 -8; - rel2.to: "base"; - visible: 0; - } - desc { "visible"; - inherit: "default"; - fixed: 1 0; - aspect: 1.0 1.0; - visible: 1; - } - desc { "icononly"; - inherit: "default"; - fixed: 0 0; - align: 0.5 0.5; - rel2.relative: 1.0 1.0; - rel2.offset: -7 -8; - visible: 1; + color: 96 96 96 255; } } } programs { - program { - signal: "mouse,down,1"; source: "event"; + program { signal: "mouse,down,1"; source: "event*"; action: SIGNAL_EMIT "elm,action,press" "elm"; after: "button_click_anim"; } program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "shadow"; + action: STATE_SET "pressed" 0.0; target: "base"; - target: "shine"; + target: "select_line"; } program { name: "button_unclick"; - signal: "mouse,up,1"; source: "event"; + signal: "mouse,up,1"; source: "event*"; action: SIGNAL_EMIT "elm,action,unpress" "elm"; after: "button_unclick_anim"; } program { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; - target: "shadow"; target: "base"; - target: "shine"; + target: "select_line"; } - program { name: "buttonactivate"; - signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "clicked" 0.0; - target: "shadow"; + program { signal: "elm,anim,activate"; source: "elm"; + action: STATE_SET "pressed" 0.0; target: "base"; - target: "shine"; + target: "select_line"; after: "button_unpressed_anim"; } program { name: "button_unpressed_anim"; action: STATE_SET "default" 0.0; in: 0.5 0.0; - target: "shadow"; target: "base"; - target: "shine"; + target: "select_line"; } - program { - signal: "mouse,clicked,1"; source: "event"; + program { signal: "mouse,clicked,1"; source: "event*"; action: SIGNAL_EMIT "elm,action,click" "elm"; } - program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; + program { signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; + target: "base"; target: "event"; - target: "icon_clip"; + target: "event2"; + target: "select_line"; } - program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; + program { signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; + target: "base"; target: "event"; - target: "icon_clip"; + target: "event2"; + target: "select_line"; } } } diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index 8058b939ce..6f0d9cb349 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -149,7 +149,7 @@ group { name: "elm/scroller/entry/default"; } group { name: "elm/scroller/entry_single/default"; - images.image: "shadow_circle_horiz.png" COMP; + alias: "elm/scroller/entry_single/combobox_vertical/default"; images.image: "shadow_circle_vert.png" COMP; data.item: "focus_highlight" "on"; @@ -813,6 +813,8 @@ group { name: "elm/entry/base-nowrap/default"; group { name: "elm/entry/base-single/default"; inherit: "elm/entry/base/default"; + alias: "elm/entry/base-single/combobox_vertical/default"; + alias: "elm/entry/base-single/combobox_vertical/entry"; styles { style { name: "entry_single_style"; base: "font="FN" font_size=10 color=#a0a0a0 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; diff --git a/data/elementary/themes/edc/elm/hover.edc b/data/elementary/themes/edc/elm/hover.edc index 9539c5bcd9..158202acd1 100644 --- a/data/elementary/themes/edc/elm/hover.edc +++ b/data/elementary/themes/edc/elm/hover.edc @@ -573,15 +573,17 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } } part { name: "button_image"; type: RECT; + scale: 1; description { state: "default" 0.0; rel1.to_x: "limit0"; rel2.to_x: "limit1"; rel1.to_y: "elm.swallow.slot.top"; rel2.to_y: "elm.swallow.slot.middle"; rel2.relative: 1.0 0.0; - rel1.offset: 1 0; - rel2.offset: -2 1; - color: 80 80 80 255; + color: 96 96 96 255; + offscale; + rel1.offset: -5 -4; + rel2.offset: 9 1; } description { state: "bottom" 0.0; inherit: "default" 0.0; @@ -589,11 +591,12 @@ group { name: "elm/hover/base/hoversel_vertical/default"; rel1.relative: 0.0 1.0; rel2.to_y: "elm.swallow.slot.bottom"; rel2.relative: 1.0 1.0; - rel1.offset: 1 -2; - rel2.offset: -2 -1; + rel1.offset: -5 -2; + rel2.offset: 9 3; } } part { name: "limit0"; type: SPACER; + scale: 1; description { state: "default" 0.0; rel1.to_x: "elm.swallow.slot.top"; rel1.offset: 1 0; @@ -603,6 +606,7 @@ group { name: "elm/hover/base/hoversel_vertical/default"; align: 0.0 0.5; min: 1 1; max: 1 99999; + offscale; } description { state: "bottom" 0.0; inherit: "default" 0.0; @@ -610,6 +614,7 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } } part { name: "limit1"; type: SPACER; + scale: 1; description { state: "default" 0.0; rel1.to_x: "elm.swallow.slot.middle"; rel1.offset: -1 0; @@ -619,6 +624,7 @@ group { name: "elm/hover/base/hoversel_vertical/default"; align: 1.0 0.5; min: 1 1; max: 1 99999; + offscale; } description { state: "bottom" 0.0; inherit: "default" 0.0; @@ -626,6 +632,7 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } } part { name: "select_line"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; fixed: 1 1; align: 1.0 0.5; @@ -638,23 +645,24 @@ group { name: "elm/hover/base/hoversel_vertical/default"; part { name: "topclip"; type: RECT; description { state: "default" 0.0; rel2.to_y: "button_image"; - rel2.offset: -1 -6; } } part { name: "elm.swallow.slot.top"; type: SWALLOW; clip_to: "topclip"; + scale: 1; description { state: "default" 0.0; visible: 1; align: 0.0 0.0; fixed: 0 1; rel1.to: "elm.swallow.slot.middle"; rel1.relative: 0.0 0.0; - rel1.offset: 0 -1; + rel1.offset: 6 -4; rel2.to: "elm.swallow.slot.middle"; rel2.relative: 1.0 0.0; /* set negative offset along x axis not to make "select_line" part exceed parent's width */ - rel2.offset: -9 -1; + rel2.offset: -12 3; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -663,33 +671,32 @@ group { name: "elm/hover/base/hoversel_vertical/default"; description { state: "right" 0.0; inherit: "default" 0.0; align: 1.0 0.0; - rel2.offset: -9 -1; } description { state: "right_visible" 0.0; inherit: "default" 0.0; align: 1.0 1.0; - rel2.offset: -9 -1; } } part { name: "bottomclip"; type: RECT; description { state: "default" 0.0; rel1.to_y: "button_image"; - rel1.offset: 0 3; } } part { name: "elm.swallow.slot.bottom"; type: SWALLOW; clip_to: "bottomclip"; + scale: 1; description { state: "default" 0.0; align: 0.0 1.0; fixed: 0 1; rel1.to: "elm.swallow.slot.middle"; rel1.relative: 0.0 1.0; - rel1.offset: 1 0; + rel1.offset: 6 -2; rel2.to: "elm.swallow.slot.middle"; rel2.relative: 1.0 1.0; /* set negative offset along x axis not to make "select_line" part exceed parent's width */ - rel2.offset: -9 -1; + rel2.offset: -12 -5; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -698,12 +705,10 @@ group { name: "elm/hover/base/hoversel_vertical/default"; description { state: "right" 0.0; inherit: "default" 0.0; align: 1.0 1.0; - rel2.offset: -9 -1; } description { state: "right_visible" 0.0; inherit: "default" 0.0; align: 1.0 0.0; - rel2.offset: -9 -1; } } part { name: "elm.swallow.slot.middle"; type: SWALLOW; --
