ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=5aa13939e22adc6767eeb5a3b80b48d1e9ab9cf8

commit 5aa13939e22adc6767eeb5a3b80b48d1e9ab9cf8
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Sun Aug 16 00:23:44 2015 +0530

    popup: fix content_area resize in case of custom theme
    
    Send elm,scroll,enable/disable signals in theme_apply.
    It is a fix of 0891ac5cfc2710d0c89034
    Thanks to Dave for reporting this issue.
---
 src/lib/elc_popup.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 9f6e119..4022671 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -377,10 +377,14 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data 
*sd)
      elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,visible", 
"elm");
 
    _populate_theme_scroll(sd);
-   if (!sd->theme_scroll && sd->scroll)
+   if (sd->scroll && !sd->theme_scroll)
      sd->max_sc_w = 240 * elm_config_scale_get() * elm_object_scale_get(obj);
    else
      sd->max_sc_w = 0;
+   if (!sd->scroll && sd->theme_scroll)
+     elm_layout_signal_emit(sd->content_area, "elm,scroll,disable", "elm");
+   else if (sd->scroll && sd->theme_scroll)
+     elm_layout_signal_emit(sd->content_area, "elm,scroll,enable", "elm");
 
    _visuals_set(obj);
    _scroller_size_calc(obj);

-- 


Reply via email to