ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=16639ff52605ad8e62b58047c17b66938d2a4f75
commit 16639ff52605ad8e62b58047c17b66938d2a4f75
Author: Andy Williams <a...@andywilliams.me>
Date: Sat Jan 30 13:50:41 2016 +0000
Revert "[ui] set icon size based on scale"
Fixing the icon scaling in elementary itself instead.
This reverts commit a0b90e27c6a0deb07139d7875c96071b0b84803c.
---
src/bin/edi_main.c | 2 +-
src/bin/mainview/edi_mainview.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index a327024..1f1ea80 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -373,7 +373,7 @@ edi_content_setup(Evas_Object *win, const char *path)
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_homogeneous_set(tb, EINA_FALSE);
elm_toolbar_align_set(tb, 1.0);
- elm_toolbar_icon_size_set(tb, 12 * elm_config_scale_get());
+ elm_toolbar_icon_size_set(tb, 14);
elm_object_style_set(tb, "item_horizontal");
elm_object_focus_allow_set(tb, EINA_FALSE);
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL);
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 2225bd2..c89df33 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -665,7 +665,7 @@ edi_mainview_add(Evas_Object *parent, Evas_Object *win)
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_homogeneous_set(tb, EINA_FALSE);
elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME);
- elm_toolbar_icon_size_set(tb, 16 * elm_config_scale_get());
+ elm_toolbar_icon_size_set(tb, 24);
elm_object_style_set(tb, "item_horizontal");
elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_ALWAYS);
--
