summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-03-19 12:06:18 -0400
committerMike Blumenkrantz <zmike@samsung.com>2020-03-19 12:06:18 -0400
commitb631aae420f269dc68e089604d3b8ae73790efd6 (patch)
tree1f5a26b6faaf126675fce686508521a820726655
parent33d17369acff1d80dbf46363583b1bd9899e28d1 (diff)
downloadefl-b631aae420f269dc68e089604d3b8ae73790efd6.tar.gz
efl/wl: auto-unset weight if popups provide a size in their positioner
Summary: we "sometimes" set this to EXPAND,EXPAND in the base efl object constructor, so we need to unset that in this case Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11543
-rw-r--r--src/lib/efl_canvas_wl/efl_canvas_wl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl.c b/src/lib/efl_canvas_wl/efl_canvas_wl.c
index 521e41d191..23413110ef 100644
--- a/src/lib/efl_canvas_wl/efl_canvas_wl.c
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl.c
@@ -983,7 +983,12 @@ _apply_positioner(Comp_Surface *cs, Shell_Positioner *sp)
h = zy + zh - y;
}
evas_object_move(cs->obj, zx + x, zy + y);
- if (w > 0) evas_object_resize(cs->obj, w, h);
+ if (w > 0)
+ {
+ if (!cs->hint_set_weight)
+ evas_object_size_hint_weight_set(cs->obj, 0, 0);
+ evas_object_resize(cs->obj, w, h);
+ }
}
static const struct wl_data_offer_interface data_device_offer_interface =