jaehwan pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=b22b943445c975750b40cbcd0b4a55c5c3d02fba
commit b22b943445c975750b40cbcd0b4a55c5c3d02fba Author: Daniel Zaoui <[email protected]> Date: Tue Dec 13 17:40:29 2016 +0900 workspace: set min/max to zoom spinner. --- src/bin/ui/workspace/workspace.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 00c1049..5f29d0e 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -396,6 +396,7 @@ _btn_minus_zoom_cb(void *data, Workspace_Data *wd = (Workspace_Data *)data; wd->zoom_factor -= 0.5 ; + if (wd->zoom_factor * 100 < 10.0) wd->zoom_factor = 0.1; elm_slider_value_set(wd->toolbar.zoom.slider, (int) (wd->zoom_factor * 100)); elm_spinner_value_set(wd->toolbar.zoom.cmb_zoom, (int)(wd->zoom_factor * 100)); @@ -410,6 +411,7 @@ _btn_plus_zoom_cb(void *data, Workspace_Data *wd = (Workspace_Data *)data; wd->zoom_factor += 0.5 ; + if (wd->zoom_factor * 100 > 1000.0) wd->zoom_factor = 10.0; elm_slider_value_set(wd->toolbar.zoom.slider, (int) (wd->zoom_factor * 100)); elm_spinner_value_set(wd->toolbar.zoom.cmb_zoom, (int)(wd->zoom_factor * 100)); @@ -2053,16 +2055,22 @@ workspace_delete_request(Evas_Object *obj) void workspace_zoom_factor_set(Evas_Object *obj, double factor) { - Eina_Stringshare *text; WS_DATA_GET(obj); + if (factor * 100 < 10.0) factor = 0.1; + if (factor * 100 > 1000.0) factor = 10.0; + if (!elm_object_disabled_get(wd->toolbar.zoom.slider)) { wd->zoom_factor = factor; +#if HAVE_TIZEN elm_slider_value_set(wd->toolbar.zoom.slider, factor * 100); +#else + Eina_Stringshare *text; text = eina_stringshare_printf("%d%%", (int)(wd->zoom_factor * 100)); elm_object_text_set(wd->toolbar.zoom.cmb_zoom, text); eina_stringshare_del(text); +#endif TODO("Fix elementary callbacks on changing value from code"); _slider_zoom_cb(wd, wd->toolbar.zoom.slider, NULL); } --
