Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c e_toolbar.c
Log Message:
Fix toolbar layer.
Modify e_gadcon so that the "Stop resizing this item" menu appears for
toolbar. No need to get w & h from the canvas to pop the menu, only need x & y.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- e_gadcon.c 12 Nov 2007 01:59:50 -0000 1.87
+++ e_gadcon.c 16 Nov 2007 03:07:54 -0000 1.88
@@ -1699,9 +1699,12 @@
ev = event_info;
if (ev->button == 3)
{
+ E_Zone *zone;
E_Menu *mn;
E_Menu_Item *mi;
- int cx, cy, cw, ch;
+ int cx, cy;
+
+ zone = e_util_zone_current_get(e_manager_current_get()),
mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post,
@@ -1720,14 +1723,18 @@
gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, mn);
}
-
- e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch);
- e_menu_activate_mouse(mn,
- e_util_zone_current_get(e_manager_current_get()),
- cx + ev->output.x, cy + ev->output.y, 1, 1,
+
+ if (gcc->gadcon->toolbar)
+ ecore_x_pointer_xy_get(zone->container->win, &cx, &cy);
+ else
+ {
+ e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, NULL,
NULL);
+ cx = cx + ev->output.x;
+ cy = cy + ev->output.y;
+ }
+ e_menu_activate_mouse(mn, zone, cx, cy, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
- ev->button);
+ e_util_evas_fake_mouse_up_later(gcc->gadcon->evas, ev->button);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_toolbar.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_toolbar.c 12 Nov 2007 20:59:10 -0000 1.8
+++ e_toolbar.c 16 Nov 2007 03:07:55 -0000 1.9
@@ -80,12 +80,13 @@
evas_object_resize(tbar->o_event, tbar->w, tbar->h);
evas_object_event_callback_add(tbar->o_event, EVAS_CALLBACK_MOUSE_DOWN,
_e_toolbar_cb_mouse_down, tbar);
+ evas_object_layer_set(tbar->o_event, 0);
+ evas_object_show(tbar->o_event);
tbar->o_base = edje_object_add(evas);
evas_object_resize(tbar->o_base, tbar->w, tbar->h);
e_theme_edje_object_set(tbar->o_base, "base/theme/toolbar",
"e/toolbar/default/base");
- evas_object_show(tbar->o_base);
e_toolbar_move_resize(tbar, tbar->x, tbar->y, tbar->w, tbar->h);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
