diff options
| author | woochan lee <wc0917.lee@samsung.com> | 2015-10-01 19:35:58 +0900 |
|---|---|---|
| committer | ChunEon Park <hermet@hermet.pe.kr> | 2015-10-01 19:35:59 +0900 |
| commit | 90aad6d593d24c1224d515756756fa0973098bd5 (patch) | |
| tree | c5896850902a9766cc70aed9d25eca39abd0f8a5 | |
| parent | 9222d641788b2c4157ee0f12343d7a09bd10973a (diff) | |
| download | elementary-90aad6d593d24c1224d515756756fa0973098bd5.tar.gz | |
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
| -rw-r--r-- | src/lib/elc_multibuttonentry.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index 3078cf5bf..0d3eb2990 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); |