diff options
author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-03-16 03:09:56 +0900 |
---|---|---|
committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-03-16 03:18:13 +0900 |
commit | e7e0162cbae0b2d14b17d6f8d16b890855abd98b (patch) | |
tree | 05e5a52a82f1be87a3619e27fb4860b720e9c414 | |
parent | fd423036fc63c963337b1a61de329017d245a3d8 (diff) | |
download | elementary-e7e0162cbae0b2d14b17d6f8d16b890855abd98b.tar.gz |
segment_control, toolbar: Fixed broken scale of widget item.
@fix. This needs to be partially backported.
Conflicts:
src/lib/elm_segment_control.c
-rw-r--r-- | src/lib/elm_segment_control.c | 6 | ||||
-rw-r--r-- | src/lib/elm_toolbar.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 00a9af9cb..0aa498e31 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -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,8 +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_widget_scale_get(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)); diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index e5623aa18..938b0242e 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -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); |