summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinyong Park <j4939.park@samsung.com>2016-04-11 23:31:03 +0900
committerHermet Park <hermet@hermet.pe.kr>2016-04-11 23:31:03 +0900
commitedcfc6d036fa8b838bba61fe0819ebb0e6652b53 (patch)
tree0ff2f6cf5c97158d1d2f100c21b47d6d6f5c98b1
parente561a65c397ef373b0013f419e47c4df047b2549 (diff)
popup : fix scale calculation in _scroller_size_calc
Summary: when calculate real size of action area in _scroller_size_calc, edje base scale is omitted. Reviewers: jaehwan, id213sin, cedric, raster, singh.amitesh, SanghyeonLee, Hermet Reviewed By: Hermet Subscribers: Hermet, herb, jpeg Differential Revision: https://phab.enlightenment.org/D3857
-rw-r--r--src/lib/elementary/elc_popup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 016d3c284f..4c4549eb20 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -171,7 +171,8 @@ _scroller_size_calc(Evas_Object *obj)
171 if (action_area_height) 171 if (action_area_height)
172 h_action_area = 172 h_action_area =
173 (int)(atoi(action_area_height) 173 (int)(atoi(action_area_height)
174 * elm_config_scale_get() * elm_object_scale_get(obj)); 174 * elm_config_scale_get() * elm_object_scale_get(obj))
175 / edje_object_base_scale_get(elm_layout_edje_get(sd->action_area));
175 } 176 }
176 177
177 sd->max_sc_h = h - (h_title + h_action_area); 178 sd->max_sc_h = h - (h_title + h_action_area);