Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon_popup.c
Log Message:
recalc the min size, in case the container changes it's geometry
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon_popup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_gadcon_popup.c 25 Aug 2007 09:41:25 -0000 1.2
+++ e_gadcon_popup.c 26 Aug 2007 11:16:31 -0000 1.3
@@ -24,8 +24,7 @@
e_popup_layer_set(pop->win, 990);
o = edje_object_add(pop->win->evas);
- e_theme_edje_object_set(o, "base/theme/gadman",
- "e/gadman/popup");
+ e_theme_edje_object_set(o, "base/theme/gadman", "e/gadman/popup");
evas_object_show(o);
evas_object_move(o, 0, 0);
e_popup_edje_bg_object_set(pop->win, o);
@@ -47,9 +46,7 @@
E_OBJECT_CHECK(pop);
E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
- old_o =
- edje_object_part_swallow_get(pop->o_bg,
- "e.swallow.content");
+ old_o = edje_object_part_swallow_get(pop->o_bg, "e.swallow.content");
if (old_o)
{
edje_object_part_unswallow(pop->o_bg, old_o);
@@ -67,13 +64,24 @@
EAPI void
e_gadcon_popup_show(E_Gadcon_Popup *pop)
{
+ Evas_Object *o;
Evas_Coord gx, gy, gw, gh, zw, zh, px, py, ww, wh;
if (!pop) return;
E_OBJECT_CHECK(pop);
E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
- if (pop->pinned) return;
+ if (pop->win->visible) return;
+
+ if (o = edje_object_part_swallow_get(pop->o_bg, "e.swallow.content"))
+ {
+ Evas_Coord w = 0, h = 0;
+
+ e_widget_min_size_get(o, &w, &h);
+ if (!w || !h)
+ edje_object_size_min_calc(o, &w, &h);
+ edje_extern_object_min_size_set(o, w, h);
+ }
evas_object_show(pop->o_bg);
edje_object_size_min_calc(pop->o_bg, &ww, &wh);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
