rimmed pushed a commit to branch eflete-0.6.1. http://git.enlightenment.org/tools/eflete.git/commit/?id=abeb3348419f9483d78d92d904af42ab276c57e6
commit abeb3348419f9483d78d92d904af42ab276c57e6 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Mon Mar 21 16:54:50 2016 +0200 Revert "workspace: add controls for zoom" Zoom not implemented yet This reverts commit ef850c44d41301d22487d783ca650ba9a1158131. --- src/bin/ui/workspace/workspace.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 2b41953..73f3a30 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -81,11 +81,6 @@ struct _Workspace_Data Evas_Object *layout; Evas_Object *obj; struct { - Evas_Object *fill; - Evas_Object *z100; - Evas_Object *slider; - } zoom; - struct { Evas_Object *normal; Evas_Object *code; Evas_Object *demo; @@ -278,33 +273,6 @@ _on_project_changed(void *data, /******************************************************************************/ static void -_zoom_controls_add(Workspace_Data *wd) -{ - Elm_Object_Item *tb_it; - Evas_Object *img; - - wd->toolbar.zoom.fill = elm_button_add(wd->toolbar.obj); - tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL); - elm_object_item_part_content_set(tb_it, NULL, wd->toolbar.zoom.fill); - - wd->toolbar.zoom.z100 = elm_button_add(wd->toolbar.obj); - elm_object_text_set(wd->toolbar.zoom.z100, _("100%")); - tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL); - elm_object_item_part_content_set(tb_it, NULL, wd->toolbar.zoom.z100); - - wd->toolbar.zoom.slider = elm_slider_add(wd->toolbar.obj); - 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); - tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL); - elm_object_item_part_content_set(tb_it, NULL, wd->toolbar.zoom.slider); - - tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL); - elm_toolbar_item_separator_set(tb_it, true); -} - -static void _spinner_container_change(void *data, Evas_Object *obj, void *event_info __UNUSED__) @@ -758,9 +726,6 @@ workspace_add(Evas_Object *parent, Group *group) elm_toolbar_select_mode_set(wd->toolbar.obj, ELM_OBJECT_SELECT_MODE_ALWAYS); elm_layout_content_set(wd->toolbar.layout, "elm.swallow.toolbar", wd->toolbar.obj); - /* add to toolbar the zoom controls */ - _zoom_controls_add(wd); - /* add to toolbar modes switcher */ wd->toolbar.mode_switcher.normal = _radio_switcher_add(wd, "radio_normal", _mode_cb, MODE_NORMAL, NULL); tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL); --