[EGIT] [core/efl] master 11/29: efl_ui_popup_alert_scroll: check sizing evaluation while scroller is changed

[Taehyub Kim]

jaehyun pushed a commit to branch master.

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

commit f5010b7ba6d63cb665e8045b4e4ad1d8a85d7ad1
Author: Taehyub Kim <taehyub....@samsung.com>
Date:   Tue Sep 19 09:36:26 2017 +0900

    efl_ui_popup_alert_scroll: check sizing evaluation while scroller is changed
    
    Summary: add a sizing check variable for safety of sizing evaluation when 
the min size of scroller is changed.
    
    Test Plan:
    1. run elementary_test
    2. search the sample with "popup" keyword
    3. click the Efl Ui Popup Alert Scroll sample
    
    Reviewers: Jaehyun_Cho, jpeg, woohyun, thiepha, Blackmole, cedric
    
    Reviewed By: Jaehyun_Cho
    
    Differential Revision: https://phab.enlightenment.org/D5204
---
 src/lib/elementary/efl_ui_popup_alert_scroll.c         | 6 ++++++
 src/lib/elementary/efl_ui_popup_alert_scroll_private.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll.c 
b/src/lib/elementary/efl_ui_popup_alert_scroll.c
index ca0fe7663c..290fc0fda2 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll.c
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll.c
@@ -18,6 +18,8 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data 
*pd, Evas_Coord mi
    Evas_Coord w, h;
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
 
+   pd->is_sizing_eval = EINA_TRUE;
+
    if (pd->is_expandable_w && !pd->is_expandable_h)
      {
         if ((pd->max_scroll_w > -1) && (minw > pd->max_scroll_w))
@@ -59,11 +61,15 @@ _scroller_sizing_eval(Eo *obj, 
Efl_Ui_Popup_Alert_Scroll_Data *pd, Evas_Coord mi
              evas_object_resize(obj, pd->max_scroll_w, pd->max_scroll_h);
            }
      }
+
+   pd->is_sizing_eval = EINA_FALSE;
 }
 
 EOLIAN static void
 _efl_ui_popup_alert_scroll_elm_layout_sizing_eval(Eo *obj, 
Efl_Ui_Popup_Alert_Scroll_Data *pd)
 {
+   if (pd->is_sizing_eval) return;
+
    elm_layout_sizing_eval(efl_super(obj, MY_CLASS));
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll_private.h 
b/src/lib/elementary/efl_ui_popup_alert_scroll_private.h
index d72e359572..3eb4005b97 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll_private.h
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll_private.h
@@ -12,6 +12,7 @@ struct _Efl_Ui_Popup_Alert_Scroll_Data
    Evas_Coord max_scroll_h;
    Eina_Bool is_expandable_w;
    Eina_Bool is_expandable_h;
+   Eina_Bool is_sizing_eval;
 };
 
 #endif

--