hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=edcfc6d036fa8b838bba61fe0819ebb0e6652b53

commit edcfc6d036fa8b838bba61fe0819ebb0e6652b53
Author: Jinyong Park <j4939.p...@samsung.com>
Date:   Mon Apr 11 23:31:03 2016 +0900

    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
---
 src/lib/elementary/elc_popup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 016d3c2..4c4549e 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)
         if (action_area_height)
           h_action_area =
             (int)(atoi(action_area_height)
-                  * elm_config_scale_get() * elm_object_scale_get(obj));
+                  * elm_config_scale_get() * elm_object_scale_get(obj))
+                  / 
edje_object_base_scale_get(elm_layout_edje_get(sd->action_area));
      }
 
    sd->max_sc_h = h - (h_title + h_action_area);

-- 


Reply via email to