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
1c3137d7e0
commit
1f7ba01729
|
@ -359,13 +359,11 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
|||
ev = event_info;
|
||||
if ((ev->button == 3) && (!cpu_conf->menu))
|
||||
{
|
||||
E_Menu *ma, *mg, *mo;
|
||||
E_Menu *m, *mo;
|
||||
E_Menu_Item *mi;
|
||||
int cx, cy, cw, ch;
|
||||
|
||||
ma = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(ma, _menu_cb_post, inst);
|
||||
cpu_conf->menu = ma;
|
||||
m = e_menu_new();
|
||||
|
||||
mo = e_menu_new();
|
||||
cpu_conf->menu_interval = mo;
|
||||
|
@ -405,16 +403,16 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
|||
if (inst->ci->interval >= 30.0) e_menu_item_toggle_set(mi, 1);
|
||||
e_menu_item_callback_set(mi, _cpu_menu_very_slow, inst);
|
||||
|
||||
mg = e_menu_new();
|
||||
|
||||
mi = e_menu_item_new(mg);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, D_("Time Between Updates"));
|
||||
e_menu_item_submenu_set(mi, cpu_conf->menu_interval);
|
||||
|
||||
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_menu_post_deactivate_callback_set(m, _menu_cb_post, inst);
|
||||
cpu_conf->menu = m;
|
||||
|
||||
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch);
|
||||
e_menu_activate_mouse(ma,
|
||||
e_menu_activate_mouse(m,
|
||||
e_util_zone_current_get(e_manager_current_get()),
|
||||
cx + ev->output.x, cy + ev->output.y, 1, 1,
|
||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||
|
|
Loading…
Reference in New Issue