forked from enlightenment/enlightenment
e toolbar gadgets no longer crash when trying to display a popup
SVN revision: 84258
This commit is contained in:
parent
8a3cf51692
commit
88f00310d7
|
@ -1,3 +1,7 @@
|
||||||
|
2013-02-20 Mike Blumenkrantz
|
||||||
|
|
||||||
|
* toolbar gadgets no longer crash when trying to display a popup
|
||||||
|
|
||||||
2013-02-19 Mike Blumenkrantz
|
2013-02-19 Mike Blumenkrantz
|
||||||
|
|
||||||
* e_util_size_debug_set now displays delete events
|
* e_util_size_debug_set now displays delete events
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -183,3 +183,4 @@ Fixes:
|
||||||
* fixed bug where e_layout would ignore frozen state and crash
|
* fixed bug where e_layout would ignore frozen state and crash
|
||||||
* fixed disable of input methods in input method config dialog
|
* fixed disable of input methods in input method config dialog
|
||||||
* fixed pointer warp when pointer was inside warp window but not directly over it
|
* fixed pointer warp when pointer was inside warp window but not directly over it
|
||||||
|
* toolbar gadgets no longer crash when trying to display a popup
|
||||||
|
|
|
@ -748,7 +748,9 @@ e_gadcon_zone_get(E_Gadcon *gc)
|
||||||
{
|
{
|
||||||
E_OBJECT_CHECK_RETURN(gc, NULL);
|
E_OBJECT_CHECK_RETURN(gc, NULL);
|
||||||
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
|
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
|
||||||
return gc->zone;
|
if (gc->zone) return gc->zone;
|
||||||
|
if (!gc->toolbar) return NULL;
|
||||||
|
return gc->toolbar->fwin->border->zone;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -103,6 +103,7 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
|
||||||
e_gadcon_toolbar_set(tbar->gadcon, tbar);
|
e_gadcon_toolbar_set(tbar->gadcon, tbar);
|
||||||
e_gadcon_xdnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
|
e_gadcon_xdnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
|
||||||
e_gadcon_dnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
|
e_gadcon_dnd_window_set(tbar->gadcon, tbar->fwin->evas_win);
|
||||||
|
e_gadcon_ecore_evas_set(tbar->gadcon, tbar->fwin->ecore_evas);
|
||||||
e_gadcon_util_menu_attach_func_set(tbar->gadcon,
|
e_gadcon_util_menu_attach_func_set(tbar->gadcon,
|
||||||
_e_toolbar_menu_items_append, tbar);
|
_e_toolbar_menu_items_append, tbar);
|
||||||
e_gadcon_populate(tbar->gadcon);
|
e_gadcon_populate(tbar->gadcon);
|
||||||
|
|
Loading…
Reference in New Issue