nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=074941f8ca8e7c0831a1205876fc2bde2f1cb90e
commit 074941f8ca8e7c0831a1205876fc2bde2f1cb90e Author: Mykyta Biliavskyi <[email protected]> Date: Tue Jul 26 21:33:41 2016 +0300 Tizen theme: make "+" and "-" button on tulbar clickable. --- data/themes/tizen/widgets/button.edc | 127 +++++++++++++++++++++++++++++++++++ src/bin/ui/workspace/workspace.c | 41 ++++++++++- 2 files changed, 167 insertions(+), 1 deletion(-) diff --git a/data/themes/tizen/widgets/button.edc b/data/themes/tizen/widgets/button.edc index 7070e43..40ae079 100644 --- a/data/themes/tizen/widgets/button.edc +++ b/data/themes/tizen/widgets/button.edc @@ -2366,3 +2366,130 @@ group { name: "elm/button/base/fit"; } } } + +group { name: "elm/button/base/minus_zoom"; + inherit: "elm/button/base/default"; + images { + image: "WYSIWG/tool_zoom_out_nor.png" COMP; + image: "WYSIWG/tool_zoom_out_sel.png" COMP; + image: "WYSIWG/tool_zoom_out_mv.png" COMP; + } + parts { + part { name: "button_image"; + type: IMAGE; + mouse_events: 1; + description { state: "default" 0.0; + min: 7 7; + max: 7 7; + color_class: ""; + image { + normal: "WYSIWG/tool_zoom_out_nor.png"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "WYSIWG/tool_zoom_out_sel.png"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "hovered" 0.0; + inherit: "default" 0.0; + image.normal: "WYSIWG/tool_zoom_out_mv.png"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + } + } + part { name: "border"; + type: RECT; + description { state: "default"; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + } + description { state: "clicked" 0.0; + inherit: "visible" 0.00; + } + description { state: "hovered" 0.0; + inherit: "clicked" 0.00; + } + description { state: "focused" 0.0; + inherit: "hovered" 0.00; + } + description { state: "disabled" 0.0; + inherit: "hovered" 0.00; + } + } + } +} +group { name: "elm/button/base/plus_zoom"; + inherit: "elm/button/base/default"; + images { + image: "WYSIWG/tool_zoom_in_nor.png" COMP; + image: "WYSIWG/tool_zoom_in_sel.png" COMP; + image: "WYSIWG/tool_zoom_in_mv.png" COMP; + } + parts { + part { name: "button_image"; + type: IMAGE; + mouse_events: 1; + description { state: "default" 0.0; + min: 7 7; + max: 7 7; + color_class: ""; + image { + normal: "WYSIWG/tool_zoom_in_nor.png"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "WYSIWG/tool_zoom_in_sel.png"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "hovered" 0.0; + inherit: "default" 0.0; + image { + normal: "WYSIWG/tool_zoom_in_mv.png"; + } + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + } + } + part { name: "border"; + type: RECT; + description { state: "default"; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + } + description { state: "clicked" 0.0; + inherit: "visible" 0.00; + } + description { state: "hovered" 0.0; + inherit: "clicked" 0.00; + } + description { state: "focused" 0.0; + inherit: "hovered" 0.00; + } + description { state: "disabled" 0.0; + inherit: "hovered" 0.00; + } + } + } +} diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index a6ed87d..3b55087 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -359,6 +359,32 @@ _combobox_item_del(void *data, #if HAVE_TIZEN static void +_btn_minus_zoom_cb(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Workspace_Data *wd = (Workspace_Data *)data; + + wd->zoom_factor -= 0.5 ; + elm_slider_value_set(wd->toolbar.zoom.slider, (int) (wd->zoom_factor * 100)); + + _members_zoom_set(wd); +} + +static void +_btn_plus_zoom_cb(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Workspace_Data *wd = (Workspace_Data *)data; + + wd->zoom_factor += 0.5 ; + elm_slider_value_set(wd->toolbar.zoom.slider, (int) (wd->zoom_factor * 100)); + + _members_zoom_set(wd); +} + +static void _spinner_zoom_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) @@ -395,7 +421,6 @@ static void _zoom_controls_add(Workspace_Data *wd) { Elm_Object_Item *tb_it; - Evas_Object *img; wd->toolbar.zoom.fit = elm_button_add(wd->toolbar.obj); evas_object_smart_callback_add(wd->toolbar.zoom.fit, "clicked", _fit_cb, wd); @@ -416,10 +441,24 @@ _zoom_controls_add(Workspace_Data *wd) evas_object_smart_callback_add(wd->toolbar.zoom.slider, "slider,drag,start", _slider_zoom_start_cb, wd); evas_object_smart_callback_add(wd->toolbar.zoom.slider, "changed", _slider_zoom_cb, wd); evas_object_smart_callback_add(wd->toolbar.zoom.slider, "slider,drag,stop", _slider_zoom_stop_cb, wd); +#if HAVE_TIZEN + Evas_Object *btn = elm_button_add(wd->toolbar.obj); + elm_object_style_set(btn, "minus_zoom"); + evas_object_show(btn); + evas_object_smart_callback_add(btn, "clicked", _btn_minus_zoom_cb, wd); + elm_object_part_content_set(wd->toolbar.zoom.slider, "elm.swallow.icon", btn); + btn = elm_button_add(wd->toolbar.obj); + elm_object_style_set(btn, "plus_zoom"); + evas_object_show(btn); + evas_object_smart_callback_add(btn, "clicked", _btn_plus_zoom_cb, wd); + elm_object_part_content_set(wd->toolbar.zoom.slider, "elm.swallow.end", btn); +#else + Evas_Object *img; IMAGE_ADD_NEW(wd->toolbar.zoom.slider, img, "icon", "scale_smaller") elm_object_part_content_set(wd->toolbar.zoom.slider, "elm.swallow.icon", img); IMAGE_ADD_NEW(wd->toolbar.zoom.slider, img, "icon", "scale_larger") elm_object_part_content_set(wd->toolbar.zoom.slider, "elm.swallow.end", img); +#endif #if HAVE_TIZEN evas_object_size_hint_min_set(wd->toolbar.zoom.slider, 134, 0); Evas_Object *zoom_layout = elm_layout_add(wd->toolbar.obj); --
