rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=80513bc5fdd69ec7e880495d937a2d50d9142b8a
commit 80513bc5fdd69ec7e880495d937a2d50d9142b8a
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date: Mon Jun 13 14:43:54 2016 +0300
Tizen theme: update layout for zoom controls.
---
data/themes/tizen/images/tool_percent_nor.png | Bin 0 -> 172 bytes
data/themes/tizen/widgets/layout.edc | 1 +
data/themes/tizen/widgets/layouts/zoom.edc | 67 ++++++++++++++++++++++++++
src/bin/ui/workspace/workspace.c | 19 ++++++--
4 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/data/themes/tizen/images/tool_percent_nor.png
b/data/themes/tizen/images/tool_percent_nor.png
new file mode 100644
index 0000000..595c833
Binary files /dev/null and b/data/themes/tizen/images/tool_percent_nor.png
differ
diff --git a/data/themes/tizen/widgets/layout.edc
b/data/themes/tizen/widgets/layout.edc
index f43899f..319fbff 100644
--- a/data/themes/tizen/widgets/layout.edc
+++ b/data/themes/tizen/widgets/layout.edc
@@ -1957,3 +1957,4 @@ group { name: "elm/layout/popup/1swallow_subtext";
#include "layouts/tabs.edc"
#include "layouts/workspace.edc"
#include "layouts/container.edc"
+#include "layouts/zoom.edc"
diff --git a/data/themes/tizen/widgets/layouts/zoom.edc
b/data/themes/tizen/widgets/layouts/zoom.edc
new file mode 100644
index 0000000..a39f17a
--- /dev/null
+++ b/data/themes/tizen/widgets/layouts/zoom.edc
@@ -0,0 +1,67 @@
+group { name: "elm/layout/zoom/controls";
+ images {
+ image: "tool_percent_nor.png" COMP;
+ }
+ parts {
+ part { name: "swallow.slider";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ align: 0.0 0.5;
+ min: 134 0;
+ max: 134 -1;
+ }
+ }
+ part { name: "spacer.slider";
+ type: SPACER;
+ description { state: "default" 0.0;
+ align: 0.0 0.5;
+ min: 17 0;
+ max: 17 -1;
+ rel1 {
+ relative: 1.0 0.0;
+ to_x: "swallow.slider";
+ }
+ }
+ }
+ part { name: "image.percents";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ align: 1.0 0.5;
+ min: 9 9;
+ max: 9 9;
+ image.normal: "tool_percent_nor.png";
+ fill.smooth: 0;
+ }
+ }
+ part { name: "spacer.percents";
+ type: SPACER;
+ description { state: "default" 0.0;
+ align: 1.0 0.5;
+ fixed: 1 0;
+ min: 5 5;
+ max: 5 5;
+ rel1.to_x: "image.percents";
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "image.percents";
+ }
+ }
+ }
+ part { name: "swallow.spinner";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ align: 1.0 0.5;
+ min: 76 0;
+ max: 76 -1;
+ rel1.to_x: "spacer.slider";
+ rel1.relative: 1.0 0;
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "spacer.percents";
+ }
+ }
+ }
+ }
+}
+
+
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 4d5c374..83c4e8c 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -370,14 +370,25 @@ _zoom_controls_add(Workspace_Data *wd)
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);
+#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);
+ elm_layout_theme_set(zoom_layout, "layout", "zoom", "controls");
+ evas_object_show(zoom_layout);
+ elm_object_part_content_set(zoom_layout, "swallow.slider",
wd->toolbar.zoom.slider);
+#else
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);
+#endif
#if HAVE_TIZEN
SPINNER_ADD(wd->toolbar.obj, wd->toolbar.zoom.cmb_zoom, 10, 1000, 10, true);
evas_object_size_hint_min_set(wd->toolbar.zoom.cmb_zoom, 76, 0);
elm_spinner_value_set(wd->toolbar.zoom.cmb_zoom, 100);
evas_object_smart_callback_add(wd->toolbar.zoom.cmb_zoom, "changed",
_spinner_zoom_cb, wd);
+ elm_object_part_content_set(zoom_layout, "swallow.spinner",
wd->toolbar.zoom.cmb_zoom);
+ tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL);
+ elm_object_item_part_content_set(tb_it, NULL, zoom_layout);
#else
int i = 0;
Eina_Stringshare *text;
@@ -385,16 +396,16 @@ _zoom_controls_add(Workspace_Data *wd)
evas_object_size_hint_min_set(wd->toolbar.zoom.cmb_zoom, 70, 0);
ewe_combobox_text_set(wd->toolbar.zoom.cmb_zoom, _("100%"));
evas_object_smart_callback_add(wd->toolbar.zoom.cmb_zoom, "selected",
_zoom_selected_cb, wd);
- while (zoom_values[i])
- {
+ while (zoom_values[i])
+ {
text = eina_stringshare_printf("%d%%", zoom_values[i]);
ewe_combobox_item_add(wd->toolbar.zoom.cmb_zoom, text);
eina_stringshare_del(text);
i++;
- }
-#endif
+ }
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.cmb_zoom);
+#endif
}
static void
--
