hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=90aad6d593d24c1224d515756756fa0973098bd5
commit 90aad6d593d24c1224d515756756fa0973098bd5
Author: woochan lee <wc0917....@samsung.com>
Date: Thu Oct 1 19:35:58 2015 +0900
multibuttonentry: Fix padding to be affected by base_scale in edc.
Summary:
MBE internal box get its padding size from edc.
Previously, it does not consider when calculating the padding size.
In this commit, the padding size from edc is divided by its base_scale
so that desirable size can be calculated.
@fix
Reviewers: Hermet, cedric
Differential Revision: https://phab.enlightenment.org/D3103
---
src/lib/elc_multibuttonentry.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 3078cf5..0d3eb29 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -105,8 +105,10 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj,
Elm_Multibuttonentry_Data
if (str) vpad = atoi(str);
elm_box_padding_set
(sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get(),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get());
+ hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)),
+ vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)));
EINA_LIST_FOREACH(sd->items, l, eo_item)
{
@@ -1415,8 +1417,10 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data
*sd)
if (str) vpad = atoi(str);
elm_box_padding_set
(sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get(),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get());
+ hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)),
+ vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)));
elm_box_layout_set(sd->box, _box_layout_cb, obj, NULL);
elm_box_homogeneous_set(sd->box, EINA_FALSE);
--
