rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=28bfb2d7170b15bb6ed5d99bd01955bd3a20e93b
commit 28bfb2d7170b15bb6ed5d99bd01955bd3a20e93b Author: Mykyta Biliavskyi <[email protected]> Date: Mon Jul 25 21:13:18 2016 +0300 Tizen theme: create style for colorselector. Update style accordingly to the general guideline. Change palette. --- data/themes/tizen/color_classes.edc | 16 + .../images/Tizen general/colorbar_btn_l_mv.png | Bin 0 -> 1054 bytes .../images/Tizen general/colorbar_btn_l_nor.png | Bin 0 -> 2855 bytes .../images/Tizen general/colorbar_btn_l_sel.png | Bin 0 -> 1056 bytes .../images/Tizen general/colorbar_btn_r_mv.png | Bin 0 -> 2858 bytes .../images/Tizen general/colorbar_btn_r_nor.png | Bin 0 -> 2857 bytes .../images/Tizen general/colorbar_btn_r_sel.png | Bin 0 -> 2860 bytes data/themes/tizen/widgets/colorselector.edc | 1357 +++++++++++--------- .../ui/live_view/elementary/live_colorselector.c | 14 + src/bin/ui/popup.c | 23 + src/bin/ui/property/property_common.c | 18 +- 11 files changed, 829 insertions(+), 599 deletions(-) diff --git a/data/themes/tizen/color_classes.edc b/data/themes/tizen/color_classes.edc index a2e564a..2ad7f6f 100644 --- a/data/themes/tizen/color_classes.edc +++ b/data/themes/tizen/color_classes.edc @@ -195,7 +195,23 @@ color_classes { color3: 0 0 0 0; } + color_class { name: "colorselector_border_bg"; + color: 255 255 255 255; + color2: 0 0 0 0; + color3: 0 0 0 0; + } + color_class { name: "colorselector_bg"; + color: 248 248 248 255; + color2: 0 0 0 0; + color3: 0 0 0 0; + } + color_class { name: "popup_helper_border"; + color: 0 138 238 255; + color2: 0 0 0 0; + color3: 0 0 0 0; + } + } diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_l_mv.png b/data/themes/tizen/images/Tizen general/colorbar_btn_l_mv.png new file mode 100644 index 0000000..00d58e0 Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_l_mv.png differ diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_l_nor.png b/data/themes/tizen/images/Tizen general/colorbar_btn_l_nor.png new file mode 100644 index 0000000..0710be7 Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_l_nor.png differ diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_l_sel.png b/data/themes/tizen/images/Tizen general/colorbar_btn_l_sel.png new file mode 100644 index 0000000..f976113 Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_l_sel.png differ diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_r_mv.png b/data/themes/tizen/images/Tizen general/colorbar_btn_r_mv.png new file mode 100644 index 0000000..560befb Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_r_mv.png differ diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_r_nor.png b/data/themes/tizen/images/Tizen general/colorbar_btn_r_nor.png new file mode 100644 index 0000000..117af1e Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_r_nor.png differ diff --git a/data/themes/tizen/images/Tizen general/colorbar_btn_r_sel.png b/data/themes/tizen/images/Tizen general/colorbar_btn_r_sel.png new file mode 100644 index 0000000..6c8e7b6 Binary files /dev/null and b/data/themes/tizen/images/Tizen general/colorbar_btn_r_sel.png differ diff --git a/data/themes/tizen/widgets/colorselector.edc b/data/themes/tizen/widgets/colorselector.edc index 0186673..27d4ae7 100644 --- a/data/themes/tizen/widgets/colorselector.edc +++ b/data/themes/tizen/widgets/colorselector.edc @@ -1,831 +1,992 @@ -images { - image: "Custom/bg_demo.png" COMP; - image: "Custom/color-sight.png" COMP; - image: "Tizen general/color_pin_nor.png" COMP; + +group { name: "elm/layout/popup/colorselector"; + parts { + part { name: "event"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.offset: -9999 -9999; + rel2.offset: 9999 9999; + } + } + part { name: "border"; + type: RECT; + description { state: "default" 0.0; + min: 404 263; + max: 404 263; + color_class: "popup_helper_border"; + rel1.offset: -1 -1; + rel2.offset: 0 0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1.to: "border"; + rel2.to: "border"; + } + } + } + programs { + program { name: "dismiss"; + signal: "mouse,up,*"; + source: "event"; + action: SIGNAL_EMIT "hint,dismiss" "eflete"; + } + } } -group { name: "elm/colorselector/palette/default"; - data { - item: "vertical_pad" "0"; - item: "horizontal_pad" "0"; +group { name: "elm/button/base/colorselector/default"; + parts { + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + text { + font: FN; + size: 1; + } + } + } + } +} + +group { name: "elm/button/base/colorselector/right/default"; + images { + image: "Tizen general/colorbar_btn_r_nor.png" COMP; + image: "Tizen general/colorbar_btn_r_mv.png" COMP; + image: "Tizen general/colorbar_btn_r_sel.png" COMP; } parts { - part { name: "elm.picker"; - type: SWALLOW; + part { name: "border_bg"; + type: RECT; description { state: "default" 0.0; - align: 0.5 0.0; - fixed: 1 1; - rel1.offset: 0 12; - rel2.relative: 1.0 0.0; + min: 24 24; + max: 24 24; + color: 117 117 117 255; + } + description { state: "clicked" 0.0; + inherit: "default" 0.00; + color: 0 137 236 255; + } + description { state: "hilighted" 0.0; + inherit: "default" 0.00; + color: 51 51 51 255; } } - part { name: "elm.palette"; - type: SWALLOW; + part { name: "bg"; + type: RECT; description { state: "default" 0.0; - align: 0.5 1.0; - fixed: 1 1; rel1 { - relative: 0.0 1.0; - offset: 0 14; - to_y: "elm.picker"; + offset: 1 1; + to: "border_bg"; } rel2 { - relative: 1.0 0.0; - offset: -1 -26; - to_y: "elm.selector"; + offset: -2 -2; + to: "border_bg"; } } - description { state: "off" 0.0; - align: 0.5 0.0; - rel1.relative: 0.0 1.0; - rel2.relative: 1.0 0.0; + } + part { name: "icon"; + type: IMAGE; + description { state: "default" 0.0; + min: 22 22; + max: 22 22; + image.normal: "Tizen general/colorbar_btn_r_nor.png"; + fill.smooth: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/colorbar_btn_r_sel.png"; + } + description { state: "hilighted" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/colorbar_btn_r_mv.png"; } } - part { name: "elm.selector"; - type: SWALLOW; + part { name: "event"; + type: RECT; description { state: "default" 0.0; - align: 0.0 1.0; - fixed: 1 1; - min: 0 100; - rel1.relative: 0.0 1.0; + color: 0 0 0 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 0; } } } programs { - program { name: "program_0x10734c0"; - signal: "elm,state,palette"; - source: "elm"; - action: STATE_SET "off" 0.00; - target: "elm.palette"; + program { name: "button_click"; + signal: "mouse,down,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,press" ""; + after: "button_click_anim"; } - program { name: "program_0x1073990"; - signal: "elm,state,palette"; - source: "elm"; - action: STATE_SET "default" 0.00; - target: "elm.palette"; + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + after: "button_unclick_anim"; } - program { name: "program_0x1073ce0"; - signal: "elm,state,components"; + program { name: "button_pressed_anim"; + signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "off" 0.00; - target: "elm.palette"; + action: STATE_SET "clicked" 0.00; + target: "icon"; + target: "border_bg"; + after: "button_unpressed_anim"; } - program { name: "program_0x1074370"; - signal: "elm,state,both"; + program { name: "button_unclick2"; + signal: "mouse,clicked,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "disable"; + signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "off" 0.00; - target: "elm.palette"; + action: STATE_SET "disabled" 0.00; + target: "event"; + target: "icon"; } - program { name: "program_0x10746d0"; - signal: "elm,state,both"; + program { name: "enable"; + signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.00; - target: "elm.palette"; + target: "event"; + target: "icon"; } - program { name: "program_0x1074bc0"; - signal: "elm,state,picker"; - source: "elm"; - action: STATE_SET "off" 0.00; - target: "elm.palette"; + program { name: "mouse_in"; + signal: "mouse,in"; + source: "event"; + action: STATE_SET "hilighted" 0.00; + target: "icon"; + target: "border_bg"; } - program { name: "program_0x1075260"; - signal: "elm,state,all"; - source: "elm"; + program { name: "mouse_out"; + signal: "mouse,out"; + source: "event"; + filter: "icon" "hilighted"; action: STATE_SET "default" 0.00; - target: "elm.palette"; + target: "icon"; + target: "border_bg"; + } + program { name: "button_click_anim"; + action: STATE_SET "clicked" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "button_unpressed_anim"; + action: STATE_SET "default" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "button_unclick_anim"; + action: STATE_SET "default" 0.00; + target: "icon"; + target: "border_bg"; } } } -group { name: "elm/colorselector/picker/base/default"; +group { name: "elm/button/base/colorselector/left/default"; + images { + image: "Tizen general/colorbar_btn_l_nor.png" COMP; + image: "Tizen general/colorbar_btn_l_mv.png" COMP; + image: "Tizen general/colorbar_btn_l_sel.png" COMP; + } parts { - part { name: "elm.swallow.picker"; - type: SWALLOW; + part { name: "border_bg"; + type: RECT; description { state: "default" 0.0; - align: 0.0 0.0; - min: 72 76; - max: 72 76; - rel1 { - offset: 21 0; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.label.red"; - } + min: 24 24; + max: 24 24; + color: 117 117 117 255; } - } - part { name: "elm.label.red"; - type: TEXT; - description { state: "default" 0.0; - align: 1.0 0.0; - min: 15 0; - max: 15 -1; - rel2 { - relative: 0.0 1.0; - to: "elm.swallow.red"; - } - text { - font: FN; - size: 10; - ellipsis: -1.0; - } + description { state: "clicked" 0.0; + inherit: "default" 0.00; + color: 0 137 236 255; } - } - part { name: "elm.swallow.red"; - type: SWALLOW; - description { state: "default" 0.0; - align: 1.0 0.0; - min: 60 19; - max: 60 19; + description { state: "hilighted" 0.0; + inherit: "default" 0.00; + color: 51 51 51 255; } } - part { name: "elm.label.green"; - type: TEXT; + part { name: "bg"; + type: RECT; description { state: "default" 0.0; - min: 15 0; - max: 15 -1; rel1 { - relative: 0.0 1.0; - to: "elm.label.red"; + offset: 1 1; + to: "border_bg"; } rel2 { - relative: 0.0 1.0; - to: "elm.swallow.green"; - } - text { - font: FN; - size: 10; - ellipsis: -1.0; + offset: -2 -2; + to: "border_bg"; } } } - part { name: "elm.swallow.green"; - type: SWALLOW; + part { name: "icon"; + type: IMAGE; description { state: "default" 0.0; - align: 1.0 0.0; - min: 60 19; - max: 60 19; - rel1 { - relative: 0.0 1.0; - offset: 0 1; - to: "elm.swallow.red"; - } + min: 22 22; + max: 22 22; + image.normal: "Tizen general/colorbar_btn_l_nor.png"; + fill.smooth: 0; } - } - part { name: "elm.label.blue"; - type: TEXT; - description { state: "default" 0.0; - min: 15 0; - max: 15 -1; - rel1 { - relative: 0.0 1.0; - to: "elm.label.green"; - } - rel2 { - relative: 0.0 1.0; - to: "elm.swallow.blue"; - } - text { - font: FN; - size: 10; - ellipsis: -1.0; - } + description { state: "clicked" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/colorbar_btn_l_sel.png"; } - } - part { name: "elm.swallow.blue"; - type: SWALLOW; - description { state: "default" 0.0; - align: 1.0 0.0; - min: 60 19; - max: 60 19; - rel1 { - relative: 0.0 1.0; - offset: 0 1; - to: "elm.swallow.green"; - } + description { state: "hilighted" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/colorbar_btn_l_mv.png"; } } - part { name: "elm.label.alpha"; - type: TEXT; + part { name: "event"; + type: RECT; description { state: "default" 0.0; - min: 15 0; - max: 15 -1; - rel1 { - relative: 0.0 1.0; - to: "elm.label.blue"; - } - rel2 { - relative: 0.0 1.0; - to: "elm.swallow.alpha"; - } - text { - font: FN; - size: 10; - ellipsis: -1.0; - } + color: 0 0 0 0; } - } - part { name: "elm.swallow.alpha"; - type: SWALLOW; - description { state: "default" 0.0; - align: 1.0 0.0; - min: 60 19; - max: 60 19; - rel1 { - relative: 0.0 1.0; - offset: 0 1; - to: "elm.swallow.blue"; - } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 0; + color: 255 255 255 255; } } } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,press" ""; + after: "button_click_anim"; + } + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + after: "button_unclick_anim"; + } + program { name: "button_pressed_anim"; + signal: "elm,anim,activate"; + source: "elm"; + action: STATE_SET "clicked" 0.00; + target: "icon"; + target: "border_bg"; + after: "button_unpressed_anim"; + } + program { name: "button_unclick2"; + signal: "mouse,clicked,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.00; + target: "event"; + target: "icon"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "event"; + target: "icon"; + } + program { name: "mouse_in"; + signal: "mouse,in"; + source: "event"; + action: STATE_SET "hilighted" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "mouse_out"; + signal: "mouse,out"; + source: "event"; + filter: "icon" "hilighted"; + action: STATE_SET "default" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "button_click_anim"; + action: STATE_SET "clicked" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "button_unpressed_anim"; + action: STATE_SET "default" 0.00; + target: "icon"; + target: "border_bg"; + } + program { name: "button_unclick_anim"; + action: STATE_SET "default" 0.00; + target: "icon"; + target: "border_bg"; + } + } } -group { name: "elm/colorselector/picker/default"; +group { name: "elm/colorselector/base/default"; + images { + image: "Tizen general/color_pin_mv.png" COMP; + image: "Tizen general/color_pin_sel.png" COMP; + image: "Tizen general/color_pin_nor.png" COMP; + } parts { - part { name: "pat"; - type: IMAGE; + part { name: "elm.bar_bg"; + type: SWALLOW; + mouse_events: 0; description { state: "default" 0.0; - rel1 { - to: "elm.picker"; - } - rel2 { - to: "elm.picker"; - } - image { - normal: "Custom/bg_demo.png"; - middle: DEFAULT; - } - fill { - type: TILE; - } + min: 32 24; + max: -1 24; + rel1.to: "elm.arrow_bg"; + rel2.to: "elm.arrow_bg"; } } - part { name: "elm.picker"; + part { name: "elm.bar"; type: SWALLOW; + mouse_events: 0; description { state: "default" 0.0; - fixed: 1 1; - min: 51 52; - max: 51 52; + rel1.to: "elm.bar_bg"; + rel2.to: "elm.bar_bg"; } } - part { name: "cross"; - type: IMAGE; + part { name: "elm.arrow_bg"; + type: SWALLOW; description { state: "default" 0.0; - min: 35 35; - max: 35 35; - align: 0 0; rel1 { - to: "elm.picker"; - offset: 8 8; + relative: 1.0 0.0; + offset: 5 0; + to: "elm.l_button"; } rel2 { - to: "elm.picker"; - } - image { - normal: "Custom/color-sight.png"; - middle: DEFAULT; + relative: 0.0 1.0; + offset: -6 -1; + to: "elm.r_button"; } } } - } -} - -group { name: "elm/colorselector/item/default"; - parts { - part { name: "base"; + part { name: "elm.arrow"; type: RECT; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "elm.arrow_bg"; + } description { state: "default" 0.0; - min: 27 28; - max: 27 28; visible: 0; + fixed: 1 1; + min: 1 1; + rel1.to_x: "elm.arrow_bg"; + rel2.to_x: "elm.arrow_bg"; } } - part { name: "bg"; + part { name: "event"; + type: RECT; + dragable { + events: "elm.arrow"; + } + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.to: "elm.arrow_icon"; + rel2 { + to_x: "elm.arrow_icon"; + to_y: "elm.arrow_bg"; + } + } + } + part { name: "cursor"; type: RECT; description { state: "default" 0.0; - min: 18 19; - max: 18 19; + fixed: 1 1; + min: 1 1; + rel1 { + relative: 0.5 1.0; + offset: 0 -3; + to: "elm.arrow_icon"; + } + rel2 { + relative: 0.5 1.0; + offset: 0 -1; + to_x: "elm.arrow_icon"; + to_y: "elm.bar_bg"; + } } } - part { name: "color_obj"; + part { name: "elm.arrow_icon"; type: SWALLOW; - clip_to: "clipper"; + mouse_events: 0; + scale: 1; description { state: "default" 0.0; - min: 16 17; - max: 16 17; - rel1.offset: -1 -1; + visible: 0; + align: 0.5 1.0; + fixed: 1 1; + min: 13 13; + max: 13 13; + rel1.to_x: "elm.arrow"; + rel2 { + relative: 1.0 0.0; + to_x: "elm.arrow"; + to_y: "elm.bar_bg"; + } } } - part { name: "glow"; + part { name: "arrow_over"; type: IMAGE; mouse_events: 0; - repeat_events: 1; description { state: "default" 0.0; - min: 18 19; - max: 18 19; - visible: 0; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.offset: -1 -1; - rel2.offset: 0 0; + min: 13 13; + max: 13 13; + image.normal: "Tizen general/color_pin_nor.png"; + rel1.to: "elm.arrow_icon"; + rel2.to: "elm.arrow_icon"; } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color_class: "over"; + description { state: "hovered" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/color_pin_mv.png"; + } + description { state: "selected" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/color_pin_sel.png"; } } - part { name: "clipper"; - type: RECT; + part { name: "elm.r_button"; + type: SWALLOW; + scale: 1; description { state: "default" 0.0; - rel1.to: "color_obj"; - rel2.to: "color_obj"; + align: 1.0 0.5; + fixed: 1 1; + min: 24 24; + max: 24 24; + rel1.relative: 1.0 0.0; + rel2.offset: -2 -1; } - description { state: "disabled" 0.0; - color_class: "main_disabled"; - rel1.to: "color_obj"; - rel2.to: "color_obj"; + } + part { name: "elm.l_button"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.5; + fixed: 1 1; + min: 24 24; + max: 24 24; + rel2.relative: 0.0 1.0; } } - part { name: "disabler"; + part { name: "arrow_over_event"; type: RECT; + repeat_events: 1; description { state: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 0 0 0 0; + rel1.to: "arrow_over"; + rel2.to: "arrow_over"; } } } programs { - program { name: "program_0x1be4380"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "focused" 0.00; - transition: DECELERATE 0.10000; - target: "glow"; - } - program { name: "program_0x1be4870"; - signal: "elm,state,unselected"; - source: "elm"; + program { name: "mouse_over"; + signal: "mouse,in"; + source: "arrow_over_event"; + action: STATE_SET "hovered" 0.00; + target: "arrow_over"; + } + program { name: "mouse_out"; + signal: "mouse,out"; + source: "arrow_over_event"; action: STATE_SET "default" 0.00; - transition: DECELERATE 0.50000; - target: "glow"; + target: "arrow_over"; } - program { name: "program_0x1be4d60"; - signal: "elm,anim,activate"; - source: "elm"; - action: STATE_SET "focused" 0.00; - transition: DECELERATE 0.10000; - target: "glow"; - after: "active2"; + program { name: "mouse_down"; + signal: "mouse,down,1"; + source: "arrow_over_event"; + action: STATE_SET "selected" 0.00; + target: "arrow_over"; } - program { name: "active2"; + program { name: "mouse_up"; + signal: "mouse,up,1"; + source: "arrow_over_event"; action: STATE_SET "default" 0.00; - transition: DECELERATE 0.80000; - target: "glow"; - } - program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "clipper"; - target: "disabler"; - } - program { - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "clipper"; - target: "disabler"; + target: "arrow_over"; } } } -group { name: "elm/button/base/colorselector/left/default"; + +group { name: "elm/colorselector/bg_image/colorbar_3/default"; + images.image: "Custom/bg_demo.png" COMP; parts { - part { name: "base"; + part { name: "bg"; type: IMAGE; - mouse_events: 0; description { state: "default" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_l_nor.png"; - middle: DEFAULT; - } - fill.smooth: 0; - } - description { state: "clicked" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_l_sel.png"; - middle: DEFAULT; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_l_dim.png"; - middle: DEFAULT; + image.normal: "Custom/bg_demo.png"; + fill { + smooth: 0; + type: TILE; } - fill.smooth: 0; } } - part { name: "event"; - type: RECT; + } +} +group { name: "elm/colorselector/picker/default"; + images.image: "Custom/bg_demo.png" COMP; + parts { + part { name: "pat"; + type: IMAGE; description { state: "default" 0.0; - color: 0 0 0 0; + image.normal: "Custom/bg_demo.png"; + fill.type: TILE; + rel1.to: "elm.picker"; + rel2.to: "elm.picker"; } } - part { name: "disabler"; - type: RECT; + part { name: "elm.picker"; + type: SWALLOW; description { state: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + fixed: 1 1; + min: 51 52; + max: 51 52; } } } - programs { - program { name: "program_0x1b41e70"; - signal: "mouse,down,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; - after: "button_click_anim"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; - after: "button_unclick_anim"; - } - program { name: "buttonactivate"; - signal: "elm,anim,activate"; - source: "elm"; - action: STATE_SET "clicked" 0.00; - target: "base"; - after: "button_unpressed_anim"; - } - program { name: "program_0x1b42fc0"; - signal: "mouse,clicked,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.00; - target: "base"; - } - program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.00; - target: "base"; - } - program { name: "button_unpressed_anim"; - action: STATE_SET "default" 0.00; - in: 0.50000 0.00000; - target: "base"; - } - program { - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "disabler"; - } - program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "base"; - target: "disabler"; - } - } } - - -group { name: "elm/button/base/colorselector/right/default"; +group { name: "elm/colorselector/palette/default"; + data { + item: "vertical_pad" "8"; + item: "horizontal_pad" "8"; + } parts { - part { name: "base"; - type: IMAGE; - mouse_events: 0; + part { name: "bg_border"; + type: RECT; description { state: "default" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_r_nor.png"; - middle: DEFAULT; - } - fill.smooth: 0; + min: 402 261; + max: 402 261; + color_class: "colorselector_border_bg"; } - description { state: "clicked" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_r_sel.png"; - middle: DEFAULT; + } + part { name: "bg"; + type: RECT; + description { state: "default" 0.0; + color_class: "colorselector_bg"; + rel1 { + offset: 5 5; + to: "bg_border"; + } + rel2 { + offset: -6 -6; + to: "bg_border"; } - fill.smooth: 0; } - description { state: "disabled" 0.0; - min: 10 17; - max: 10 17; - image { - normal: "General/zoom_btn_r_dim.png"; - middle: DEFAULT; + } + part { name: "elm.picker"; + type: SWALLOW; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + min: 96 169; + max: 96 169; + rel1 { + relative: 1.0 0.0; + offset: 16 25; + to_x: "elm.selector"; + to_y: "bg_border"; + } + rel2 { + offset: -26 -11; + to: "bg_border"; } - fill.smooth: 0; } } - part { name: "event"; - type: RECT; + part { name: "elm.palette"; + type: SWALLOW; description { state: "default" 0.0; - color: 0 0 0 0; + align: 0.5 0.0; + fixed: 1 1; + min: 0 32; + max: -1 32; + rel1 { + relative: 0.0 1.0; + offset: 0 10; + to: "elm.selector"; + } + rel2 { + offset: -1 -26; + to_x: "elm.picker"; + to_y: "elm.selector"; + } } - description { state: "disabled" 0.0; - visible: 0; - color: 0 0 0 0; + description { state: "off" 0.0; + align: 0.5 0.0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 0.0; } } - part { name: "disabler"; - type: RECT; + part { name: "elm.selector"; + type: SWALLOW; description { state: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + align: 0.0 0.0; + fixed: 1 1; + min: 240 159; + max: 240 159; + rel1 { + offset: 25 34; + to: "bg_border"; + } + rel2 { + offset: -17 -11; + to: "bg_border"; + } } } } programs { - program { name: "program_0x1b41e70"; - signal: "mouse,down,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; - after: "button_click_anim"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; - after: "button_unclick_anim"; + program { name: "program_0x10734c0"; + signal: "elm,state,palette"; + source: "elm"; + action: STATE_SET "off" 0.00; + target: "elm.palette"; } - program { name: "buttonactivate"; - signal: "elm,anim,activate"; + program { name: "program_0x1073990"; + signal: "elm,state,palette"; source: "elm"; - action: STATE_SET "clicked" 0.00; - target: "base"; - after: "button_unpressed_anim"; + action: STATE_SET "default" 0.00; + target: "elm.palette"; } - program { name: "program_0x1b42fc0"; - signal: "mouse,clicked,1"; - source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; + program { name: "program_0x1073ce0"; + signal: "elm,state,components"; + source: "elm"; + action: STATE_SET "off" 0.00; + target: "elm.palette"; } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.00; - target: "base"; + program { name: "program_0x1074370"; + signal: "elm,state,both"; + source: "elm"; + action: STATE_SET "off" 0.00; + target: "elm.palette"; } - program { name: "button_unclick_anim"; + program { name: "program_0x10746d0"; + signal: "elm,state,both"; + source: "elm"; action: STATE_SET "default" 0.00; - target: "base"; + target: "elm.palette"; } - program { name: "button_unpressed_anim"; - action: STATE_SET "default" 0.00; - in: 0.50000 0.00000; - target: "base"; + program { name: "program_0x1074bc0"; + signal: "elm,state,picker"; + source: "elm"; + action: STATE_SET "off" 0.00; + target: "elm.palette"; } - program { - signal: "elm,state,enabled"; + program { name: "program_0x1075260"; + signal: "elm,state,all"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "disabler"; - } - program { - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "base"; - target: "disabler"; + action: STATE_SET "default" 0.00; + target: "elm.palette"; } } } -group { name: "elm/colorselector/base/default"; +group { name: "elm/colorselector/bg/default"; + min: 0 115; parts { - part { name: "elm.bar_bg"; + part { name: "elm.colorbar_0"; type: SWALLOW; - mouse_events: 0; + scale: 1; description { state: "default" 0.0; - min: 32 15; - rel1 { - offset: 1 1; - to: "elm.arrow_bg"; - } + align: 0.5 1.0; + fixed: 0 1; + min: 0 24; + max: -1 24; rel2 { - offset: -2 -3; - to: "elm.arrow_bg"; + relative: 1.0 0.0; + offset: -1 -22; + to_y: "elm.colorbar_1"; } } } - part { name: "elm.bar"; + part { name: "elm.colorbar_1"; type: SWALLOW; - mouse_events: 0; description { state: "default" 0.0; - rel1.to: "elm.bar_bg"; - rel2.to: "elm.bar_bg"; + align: 0.5 1.0; + fixed: 0 1; + min: 0 24; + max: -1 24; + rel2 { + relative: 1.0 0.0; + offset: -1 -22; + to_y: "elm.colorbar_2"; + } } } - part { name: "elm.arrow_bg"; + part { name: "elm.colorbar_2"; type: SWALLOW; description { state: "default" 0.0; - rel1 { - relative: 1.0 0.0; - to: "elm.l_button"; - } + align: 0.5 1.0; + fixed: 0 1; + min: 0 24; + max: -1 24; rel2 { - relative: 0.0 1.0; - to: "elm.r_button"; + relative: 1.0 0.0; + offset: -1 -22; + to_y: "elm.colorbar_3"; } } } - part { name: "elm.arrow"; - type: RECT; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "elm.arrow_bg"; - } + part { name: "elm.colorbar_3"; + type: SWALLOW; description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - min: 1 1; - rel1.to_x: "elm.arrow_bg"; - rel2.to_x: "elm.arrow_bg"; + align: 0.5 1.0; + fixed: 0 1; + min: 0 22; + max: -1 22; } } - part { name: "event"; - type: RECT; - dragable.events: "elm.arrow"; + } +} +group { name: "elm/colorselector/picker/base/default"; + parts { + part { name: "elm.swallow.picker"; + type: SWALLOW; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "elm.arrow_icon"; - rel2 { - to_x: "elm.arrow_icon"; - to_y: "elm.arrow_bg"; - } + align: 0.5 0.0; + fixed: 1 0; + min: 96 48; + max: 96 48; } } - part { name: "elm.arrow_icon"; - type: SWALLOW; - mouse_events: 0; - scale: 1; + part { name: "elm.label.red"; + type: TEXT; description { state: "default" 0.0; - align: 0.5 1.0; + align: 0.0 0.0; fixed: 1 1; - min: 16 16; - max: 16 16; - rel1.to_x: "elm.arrow"; - rel2 { - relative: 1.0 0.0; - offset: -1 0; - to_x: "elm.arrow"; - to_y: "elm.bar_bg"; + min: 15 24; + max: 15 24; + color_class: "genlist_text_tree"; + text { + text: "R :"; + font: "Breeze"; + size: 10; + ellipsis: -1.0; } + rel1 { + relative: 0.0 1.0; + offset: 0 10; + to: "elm.swallow.picker"; + } + rel2.to: "elm.swallow.picker"; } } - part { name: "arrow_over"; - type: IMAGE; - mouse_events: 0; + part { name: "elm.swallow.red"; + type: SWALLOW; description { state: "default" 0.0; - rel1.to: "elm.arrow_icon"; - rel2.to: "elm.arrow_icon"; - image { - normal: "Tizen general/color_pin_nor.png"; - middle: DEFAULT; + align: 1.0 0.0; + min: 0 24; + max: 76 24; + rel1 { + relative: 1.0 0.0; + offset: 5 0; + to: "elm.label.red"; + } + rel2 { + to_x: "elm.swallow.picker"; + to_y: "elm.label.red"; } } } - part { name: "elm.r_button"; - type: SWALLOW; - scale: 1; + part { name: "elm.label.green"; + type: TEXT; description { state: "default" 0.0; - align: 1.0 0.5; + align: 0.0 0.0; fixed: 1 1; - min: 10 19; - max: 10 19; - rel1.relative: 1.0 0.0; - rel2.offset: -2 -1; + min: 15 24; + max: 15 24; + color_class: "genlist_text_tree"; + text { + text: "G :"; + font: "Breeze"; + size: 10; + ellipsis: -1.0; + } + rel1 { + relative: 0.0 1.0; + offset: 0 5; + to_x: "elm.swallow.picker"; + to_y: "elm.label.red"; + } + rel2.to: "elm.swallow.picker"; } } - part { name: "elm.l_button"; + part { name: "elm.swallow.green"; type: SWALLOW; - scale: 1; description { state: "default" 0.0; - align: 0.0 0.5; + align: 0.0 0.0; fixed: 1 1; - min: 10 19; - max: 10 19; - rel1.offset: 1 0; - rel2.relative: 0.0 1.0; + min: 0 24; + max: 76 24; + rel1 { + relative: 1.0 0.0; + offset: 5 1; + to: "elm.label.green"; + } + rel2 { + to_x: "elm.swallow.picker"; + to_y: "elm.label.green"; + } } } - part { name: "cursor"; - type: RECT; + part { name: "elm.label.blue"; + type: TEXT; description { state: "default" 0.0; + align: 0.0 0.0; fixed: 1 1; - min: 1 1; + min: 15 24; + max: 15 24; + color_class: "genlist_text_tree"; + text { + text: "B :"; + font: "Breeze"; + size: 10; + ellipsis: -1.0; + } rel1 { - relative: 0.5 1.0; - offset: 0 -3; - to: "elm.arrow_icon"; + relative: 0.0 1.0; + offset: 0 5; + to_x: "elm.swallow.picker"; + to_y: "elm.label.green"; } rel2 { - relative: 0.5 1.0; - offset: 0 -1; - to_x: "elm.arrow_icon"; - to_y: "elm.bar_bg"; + relative: 0.0 1.0; + to_x: "elm.swallow.picker"; + to_y: "elm.label.green"; } } } - } -} - -group { name: "elm/colorselector/bg/default"; - min: 0 115; - parts { - part { name: "elm.colorbar_0"; + part { name: "elm.swallow.blue"; type: SWALLOW; - scale: 1; description { state: "default" 0.0; - align: 0.5 1.0; - fixed: 0 1; - min: 0 19; - max: -1 19; + align: 1.0 0.5; + min: 0 24; + max: 76 24; + rel1 { + offset: 5 0; + to: "elm.label.blue"; + } rel2 { - relative: 1.0 0.0; - offset: -1 -14; - to_y: "elm.colorbar_1"; + to_x: "elm.swallow.picker"; + to_y: "elm.label.blue"; } } } - part { name: "elm.colorbar_1"; - type: SWALLOW; + part { name: "elm.label.alpha"; + type: TEXT; description { state: "default" 0.0; - align: 0.5 1.0; + align: 0.0 0.0; fixed: 0 1; - min: 0 19; - max: -1 19; + min: 15 24; + max: 15 24; + color_class: "genlist_text_tree"; + text { + text: "A :"; + font: "Breeze"; + size: 10; + ellipsis: -1.0; + } + rel1 { + relative: 0.0 1.0; + offset: 0 5; + to_x: "elm.swallow.picker"; + to_y: "elm.label.blue"; + } rel2 { - relative: 1.0 0.0; - offset: -1 -14; - to_y: "elm.colorbar_2"; + to_x: "elm.swallow.picker"; + to_y: "elm.label.blue"; } } } - part { name: "elm.colorbar_2"; + part { name: "elm.swallow.alpha"; type: SWALLOW; description { state: "default" 0.0; - align: 0.5 1.0; + align: 1.0 0.0; fixed: 0 1; - min: 0 19; - max: -1 19; + min: 0 24; + max: 76 24; + rel1.to: "elm.label.alpha"; rel2 { - relative: 1.0 0.0; - offset: -1 -14; - to_y: "elm.colorbar_3"; + to_x: "elm.swallow.picker"; + to_y: "elm.label.alpha"; } } } - part { name: "elm.colorbar_3"; - type: SWALLOW; - description { state: "default" 0.0; - align: 0.5 1.0; - fixed: 0 1; - min: 0 19; - max: -1 19; - } - } } } - -group { name: "elm/colorselector/bg_image/colorbar_3/default"; +group { name: "elm/colorselector/item/default"; parts { + part { name: "base"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + min: 27 28; + max: 27 28; + } + } part { name: "bg"; - type: IMAGE; + type: RECT; description { state: "default" 0.0; - image { - normal: "Custom/bg_demo.png"; - middle: DEFAULT; - } - fill { - smooth: 0; - type: TILE; - } + min: 32 32; + max: 32 32; + align: 0.0 0.5; + color: 0 0 0 0; + } + } + part { name: "color_obj"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + min: 32 32; + max: 32 32; + rel1.to: "bg"; + rel2.to: "bg"; + } + } + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "color_obj"; + rel2.to: "color_obj"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + color_class: "main_disabled"; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 1; } } } + programs { + program { name: "program_0x55c45a54a420"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.00; + target: "clipper"; + target: "disabler"; + } + program { name: "program_0x55c45a54a920"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "clipper"; + target: "disabler"; + } + } } + + diff --git a/src/bin/ui/live_view/elementary/live_colorselector.c b/src/bin/ui/live_view/elementary/live_colorselector.c index 4a30fd2..09574d9 100644 --- a/src/bin/ui/live_view/elementary/live_colorselector.c +++ b/src/bin/ui/live_view/elementary/live_colorselector.c @@ -45,6 +45,20 @@ widget_colorselector_create(Evas_Object *parent, const Group *group) free(style_parsed); } +#if HAVE_TIZEN + elm_colorselector_palette_clear(object); + elm_colorselector_palette_name_set(object, "eflete_tizen"); + elm_colorselector_palette_color_add(object, 229, 3, 3, 255); + elm_colorselector_palette_color_add(object, 20, 218, 20, 255); + elm_colorselector_palette_color_add(object, 25, 46, 201, 255); + elm_colorselector_palette_color_add(object, 236, 196, 9, 255); + elm_colorselector_palette_color_add(object, 237, 10, 234, 255); + elm_colorselector_palette_color_add(object, 26, 234, 217, 255); + elm_colorselector_palette_color_add(object, 0, 0, 0, 255); + elm_colorselector_palette_color_add(object, 255, 255, 255, 255); + elm_colorselector_palette_color_add(object, 200, 200, 200, 255); +#endif + evas_object_smart_callback_add(object, SIGNAL_DEMO_SWALLOW_SET, on_swallow_check, NULL); evas_object_smart_callback_add(object, SIGNAL_DEMO_TEXT_SET, on_text_check, NULL); evas_object_smart_callback_add(object, SIGNAL_DEMO_SIGNAL_SEND, send_signal, NULL); diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c index 3a350e8..f368142 100644 --- a/src/bin/ui/popup.c +++ b/src/bin/ui/popup.c @@ -320,6 +320,7 @@ _helper_colorclass_dismiss(void *data, ecore_job_add(_delete_object_job, helper); } +#if !HAVE_TIZEN static void _colorclass_done(void *data, Evas_Object *obj __UNUSED__, @@ -327,6 +328,7 @@ _colorclass_done(void *data, { _helper_colorclass_dismiss(data, NULL, NULL, NULL); } +#endif static void _helper_dismiss(void *data __UNUSED__, @@ -866,7 +868,13 @@ popup_colorselector_helper(Evas_Object *follow_up, evas_object_del(helper); helper = elm_layout_add(ap.win); + +#if HAVE_TIZEN + elm_layout_theme_set(helper, "layout", "popup", "colorselector"); +#else elm_layout_theme_set(helper, "layout", "popup", "hint"); +#endif + evas_object_data_set(helper, "STRUCT", helper_data); elm_layout_signal_callback_add(helper, "hint,dismiss", "eflete", _helper_colorclass_dismiss, helper_data); @@ -877,6 +885,19 @@ popup_colorselector_helper(Evas_Object *follow_up, evas_object_size_hint_align_set(fs, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(fs); +#if HAVE_TIZEN + elm_colorselector_palette_clear(fs); + elm_colorselector_palette_name_set(fs, "eflete_tizen"); + elm_colorselector_palette_color_add(fs, 229, 3, 3, 255); + elm_colorselector_palette_color_add(fs, 20, 218, 20, 255); + elm_colorselector_palette_color_add(fs, 25, 46, 201, 255); + elm_colorselector_palette_color_add(fs, 236, 196, 9, 255); + elm_colorselector_palette_color_add(fs, 237, 10, 234, 255); + elm_colorselector_palette_color_add(fs, 26, 234, 217, 255); + elm_colorselector_palette_color_add(fs, 0, 0, 0, 255); + elm_colorselector_palette_color_add(fs, 255, 255, 255, 255); + elm_colorselector_palette_color_add(fs, 200, 200, 200, 255); +#endif evas_object_smart_callback_add(fs, "changed", func_change, data); evas_object_smart_callback_add(fs, "color,item,selected", func_change, data); evas_object_smart_callback_add(fs, "color,item,longpressed", func_change, data); @@ -886,10 +907,12 @@ popup_colorselector_helper(Evas_Object *follow_up, evas_object_size_hint_min_set(helper, COLOR_W, COLOR_H); evas_object_resize(helper, COLOR_W, COLOR_H); +#if !HAVE_TIZEN BUTTON_ADD(fs, helper_data->button, _("Ok")) elm_object_part_content_set(helper, "elm.swallow.ok", helper_data->button); evas_object_smart_callback_add(helper_data->button, "clicked", _colorclass_done, helper_data); evas_object_show(helper_data->button); +#endif elm_layout_content_set(helper, "elm.swallow.content", fs); evas_object_size_hint_weight_set(fs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c index 1c90832..ed43586 100644 --- a/src/bin/ui/property/property_common.c +++ b/src/bin/ui/property/property_common.c @@ -382,10 +382,26 @@ _control_create(Property_Attribute *pa, Property_Action *action, Evas_Object *pa case PROPERTY_CONTROL_COLORSEL: content = elm_colorselector_add(parent); elm_colorselector_mode_set(content, ELM_COLORSELECTOR_ALL); - evas_object_size_hint_min_set(content, 200, 270); TODO("start/stop callbacks for this item type would be incorrect. Add correct one if needed"); evas_object_smart_callback_add(content, "changed,user", _start_change_stop_cb, pa); evas_object_smart_callback_add(content, "color,item,selected", _start_change_stop_cb, pa); + +#if HAVE_TIZEN + evas_object_size_hint_min_set(content, 402, 261); + elm_colorselector_palette_clear(content); + elm_colorselector_palette_name_set(content, "eflete_tizen"); + elm_colorselector_palette_color_add(content, 229, 3, 3, 255); + elm_colorselector_palette_color_add(content, 20, 218, 20, 255); + elm_colorselector_palette_color_add(content, 25, 46, 201, 255); + elm_colorselector_palette_color_add(content, 236, 196, 9, 255); + elm_colorselector_palette_color_add(content, 237, 10, 234, 255); + elm_colorselector_palette_color_add(content, 26, 234, 217, 255); + elm_colorselector_palette_color_add(content, 0, 0, 0, 255); + elm_colorselector_palette_color_add(content, 255, 255, 255, 255); + elm_colorselector_palette_color_add(content, 200, 200, 200, 255); +#else + evas_object_size_hint_min_set(content, 200, 270); +#endif break; case PROPERTY_CONTROL_LABEL: content = elm_label_add(parent); --
