diff options
| author | Sung-Taek Hong <sth253.hong@samsung.com> | 2015-06-22 11:55:52 +0200 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-06-22 12:36:57 +0200 |
| commit | 55766647c69d3dc2c38b50ec0cbcfd7d3c0086c7 (patch) | |
| tree | 8a521ab802adccdd8a266379923baf5e22ddcdcc | |
| parent | e5bbfc208c4ef4037ccd2fc5919fca0f851cc704 (diff) | |
| download | elementary-55766647c69d3dc2c38b50ec0cbcfd7d3c0086c7.tar.gz | |
elm_colorselector: fix horiz/vertical padding to be affected by base_scale in edc
Summary:
elm_colorselector get its padding size from data in edc.
However, when calculating the padding size, it does not consider
base_scale of the style from where it gets 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, woohyun
Subscribers: woohyun, Hermet
Differential Revision: https://phab.enlightenment.org/D2721
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
| -rw-r--r-- | src/lib/elm_colorselector.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index 78bcb9336..20915f096 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1114,8 +1114,8 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) elm_box_padding_set (sd->palette_box, - (h_pad * elm_widget_scale_get(obj) * elm_config_scale_get()), - (v_pad * elm_widget_scale_get(obj) * elm_config_scale_get())); + (h_pad / edje_object_base_scale_get(wd->resize_obj) * elm_widget_scale_get(obj) * elm_config_scale_get()), + (v_pad / edje_object_base_scale_get(wd->resize_obj) * elm_widget_scale_get(obj) * elm_config_scale_get())); EINA_LIST_FOREACH(sd->items, elist, eo_item) { @@ -1605,8 +1605,8 @@ _create_colorpalette(Evas_Object *obj) elm_box_padding_set (sd->palette_box, - (h_pad * elm_widget_scale_get(obj) * elm_config_scale_get()), - (v_pad * elm_widget_scale_get(obj) * elm_config_scale_get())); + (h_pad / edje_object_base_scale_get(wd->resize_obj) * elm_widget_scale_get(obj) * elm_config_scale_get()), + (v_pad / edje_object_base_scale_get(wd->resize_obj) * elm_widget_scale_get(obj) * elm_config_scale_get())); elm_box_align_set(sd->palette_box, 0.0, 0.0); if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box)) |