[EGIT] [core/enlightenment] enlightenment-0.21 04/50: reject gadget site layout attempts only when it would be impossible

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.21.

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

commit c650f60aeab62acfb402ecd54afdae9a9972f1ad
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Aug 2 08:39:49 2017 -0400

    reject gadget site layout attempts only when it would be impossible
    
    a site with orient set is expected to fill using only one axis, so a size
    of 0xH or Wx0 is valid in some cases
    
    fix T5806
---
 src/bin/e_gadget.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 2aa1e410c..8230ed512 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -465,9 +465,10 @@ _site_layout_orient(Evas_Object *o, E_Gadget_Site *zgs)
    E_Gadget_Config *zgc;
    int mw, mh, sw, sh;
 
+   evas_object_geometry_get(o, &x, &y, &w, &h);
+   if ((!w) && (!h)) return;
    evas_object_size_hint_min_get(o, &mw, &mh);
    evas_object_size_hint_min_get(zgs->layout, &sw, &sh);
-   evas_object_geometry_get(o, &x, &y, &w, &h);
    evas_object_geometry_set(zgs->events, x, y, w, h);
 
    evas_object_box_align_get(o, &ax, &ay);
@@ -552,7 +553,6 @@ _site_layout(Evas_Object *o, Evas_Object_Box_Data *priv 
EINA_UNUSED, void *data)
    E_Gadget_Config *zgc;
 
    evas_object_geometry_get(o, &x, &y, &w, &h);
-   if ((!w) || (!h)) return;
    evas_object_geometry_set(zgs->events, x, y, w, h);
 
    evas_object_box_align_get(o, &ax, &ay);
@@ -564,6 +564,7 @@ _site_layout(Evas_Object *o, Evas_Object_Box_Data *priv 
EINA_UNUSED, void *data)
         _site_layout_orient(o, zgs);
         return;
      }
+   if ((!w) || (!h)) return;
    EINA_LIST_FOREACH(zgs->gadgets, l, zgc)
      {
         Evas_Coord gx = xx, gy = yy;

--