rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

segment_control, toolbar: Fixed broken scale of widget item. 

@fix. This needs to be partially backported.
This commit is contained in:
Daniel Juyung Seo 2014-03-16 03:09:56 +09:00
parent 2c0c0c335a
commit c69cfdf4de
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -233,7 +233,7 @@ _elm_segment_control_smart_theme(Eo *obj, void *_pd, va_list *list)
elm_widget_theme_object_set
(obj, VIEW(it), "segment_control", "item",
elm_widget_style_get(obj));
edje_object_scale_set(VIEW(it), elm_widget_scale_get(VIEW(it)) *
edje_object_scale_set(VIEW(it), elm_widget_scale_get(WIDGET(it)) *
elm_config_scale_get());
edje_object_mirrored_set(VIEW(it), rtl);
}
@ -577,7 +577,8 @@ _item_new(Evas_Object *obj,
elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
edje_object_scale_set(VIEW(it), elm_config_scale_get());
edje_object_scale_set(VIEW(it),elm_widget_scale_get(WIDGET(it)) *
elm_config_scale_get());
evas_object_smart_member_add(VIEW(it), obj);
elm_widget_sub_object_add(obj, VIEW(it));

1
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -1181,6 +1181,7 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list)
if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
else sd->icon_size = sd->theme_icon_size;
scale = (elm_widget_scale_get(obj) * elm_config_scale_get());
EINA_INLIST_FOREACH(sd->items, it)
_item_theme_hook(obj, it, scale, sd->icon_size);