Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c
Log Message:
Formatting.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_menu.c 28 Dec 2006 14:15:10 -0000 1.72
+++ e_menu.c 3 Jan 2007 16:53:48 -0000 1.73
@@ -1227,29 +1227,29 @@
/* FIXME: Not sure why there are two different tries to get the
icon size, surely only the last one si needed. */
/* FIXME: Do it this way later, when e_app_icon_add() just
registers a request for an icon to be filled in when it's ready.
- if (mi->app)
- {
- o = e_app_icon_add(mi->menu->evas, mi->app);
- mi->icon_object = o;
- e_icon_size_get(mi->icon_object, &icon_w, &icon_h);
- }
+ if (mi->app)
+ {
+ o = e_app_icon_add(mi->menu->evas, mi->app);
+ mi->icon_object = o;
+ e_icon_size_get(mi->icon_object, &icon_w, &icon_h);
+ }
else
*/
- if (mi->icon)
+ if (mi->icon)
{
- /* This is done this way to match up with how e_app_icon_add
does it. */
+ /* This is done this way to match up with how e_app_icon_add
does it. */
if (mi->icon_key)
{
Evas_Coord iww, ihh;
o = edje_object_add(mi->menu->evas);
if (edje_object_file_set(o, mi->icon, mi->icon_key))
- {
- mi->icon_object = o;
- edje_object_size_max_get(o, &iww, &ihh);
- icon_w = iww;
- icon_h = ihh;
- }
+ {
+ mi->icon_object = o;
+ edje_object_size_max_get(o, &iww, &ihh);
+ icon_w = iww;
+ icon_h = ihh;
+ }
}
if (!mi->icon_object)
{
@@ -2549,18 +2549,18 @@
ev = event_info;
e_menu_item_active_set(mi, 0);
if (_e_menu_activate_maybe_drag)
- {
- if (mi->drag_cb.func)
- {
- /* User is dragging a draggable item elsewhere. */
- mi->drag.x = ev->output.x - (ev->output.x - mi->x);
- mi->drag.y = ev->output.y - (ev->output.y - mi->y);
- _e_menu_deactivate_all();
- mi->drag_cb.func(mi->drag_cb.data, mi->menu, mi);
- }
- /* Either way, the maybe drag stops here. */
- _e_menu_activate_maybe_drag = 0;
- }
+ {
+ if (mi->drag_cb.func)
+ {
+ /* User is dragging a draggable item elsewhere. */
+ mi->drag.x = ev->output.x - (ev->output.x - mi->x);
+ mi->drag.y = ev->output.y - (ev->output.y - mi->y);
+ _e_menu_deactivate_all();
+ mi->drag_cb.func(mi->drag_cb.data, mi->menu, mi);
+ }
+ /* Either way, the maybe drag stops here. */
+ _e_menu_activate_maybe_drag = 0;
+ }
}
static int
@@ -2654,7 +2654,7 @@
* to start a drag is much more complex.
*/
if (_e_menu_activate_floating)
- _e_menu_activate_maybe_drag = 1;
+ _e_menu_activate_maybe_drag = 1;
return 1;
}
@@ -2678,11 +2678,11 @@
}
if (_e_menu_activate_dragging)
- {
- /* FIXME: This is a drop, which is not allowed for now.
- * Once dragging is working, this will be subject to some
experimenattion.
- */
- }
+ {
+ /* FIXME: This is a drop, which is not allowed for now.
+ * Once dragging is working, this will be subject to some
experimenattion.
+ */
+ }
else
ret = _e_menu_active_call();
_e_menu_activate_maybe_drag = 0;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
