e-modules: update do e_gadcon_util_cliet_menu_append api changes. allowing to have settings menu in toplevel again
SVN revision: 57828
This commit is contained in:
parent
95a4ff895b
commit
b8c7cf601e
|
@ -153,25 +153,21 @@ _net_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||||
e_gadcon_popup_toggle_pinned(inst->popup);
|
e_gadcon_popup_toggle_pinned(inst->popup);
|
||||||
else if ((ev->button == 3) && (!net_cfg->menu))
|
else if ((ev->button == 3) && (!net_cfg->menu))
|
||||||
{
|
{
|
||||||
E_Menu *ma, *mg;
|
E_Menu *m;
|
||||||
E_Menu_Item *mi;
|
E_Menu_Item *mi;
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
ma = e_menu_new();
|
m = e_menu_new();
|
||||||
e_menu_post_deactivate_callback_set(ma, _cb_post, inst);
|
mi = e_menu_item_new(m);
|
||||||
net_cfg->menu = ma;
|
|
||||||
|
|
||||||
mg = e_menu_new();
|
|
||||||
|
|
||||||
mi = e_menu_item_new(mg);
|
|
||||||
e_menu_item_label_set(mi, D_("Settings"));
|
e_menu_item_label_set(mi, D_("Settings"));
|
||||||
e_util_menu_item_theme_icon_set(mi, "preferences-system");
|
e_util_menu_item_theme_icon_set(mi, "preferences-system");
|
||||||
e_menu_item_callback_set(mi, _cb_configure, inst);
|
e_menu_item_callback_set(mi, _cb_configure, inst);
|
||||||
|
|
||||||
e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0);
|
m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
|
||||||
|
|
||||||
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
|
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
e_menu_activate_mouse(ma,
|
e_menu_activate_mouse(m,
|
||||||
e_util_zone_current_get(e_manager_current_get()),
|
e_util_zone_current_get(e_manager_current_get()),
|
||||||
x + ev->output.x, y + ev->output.y, 1, 1,
|
x + ev->output.x, y + ev->output.y, 1, 1,
|
||||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||||
|
|
Loading…
Reference in New Issue