enlightenment/edi
enlightenment
/
edi
7
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[ui] set icon size based on scale" 

Fixing the icon scaling in elementary itself instead.

This reverts commit a0b90e27c6.
This commit is contained in:
Andy Williams 2016-01-30 13:50:41 +00:00
parent a0b90e27c6
commit 16639ff526
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/edi_main.c
View File

@ -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);

2
src/bin/mainview/edi_mainview.c
View File

@ -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);