styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatting. 

SVN revision: 27760
This commit is contained in:
Sebastian Dransfeld 2007-01-03 16:53:48 +00:00
parent 077df81327
commit 076fcd4be7
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/bin/e_menu.c
View File

@ -1227,29 +1227,29 @@ _e_menu_item_realize(E_Menu_Item *mi)
/* FIXME: Not sure why there are two different tries to get the icon size, surely only the last one si needed. */ /* 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. /* 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) if (mi->app)
{ {
o = e_app_icon_add(mi->menu->evas, mi->app); o = e_app_icon_add(mi->menu->evas, mi->app);
mi->icon_object = o; mi->icon_object = o;
e_icon_size_get(mi->icon_object, &icon_w, &icon_h); e_icon_size_get(mi->icon_object, &icon_w, &icon_h);
} }
else 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) if (mi->icon_key)
{ {
Evas_Coord iww, ihh; Evas_Coord iww, ihh;
o = edje_object_add(mi->menu->evas); o = edje_object_add(mi->menu->evas);
if (edje_object_file_set(o, mi->icon, mi->icon_key)) if (edje_object_file_set(o, mi->icon, mi->icon_key))
{ {
mi->icon_object = o; mi->icon_object = o;
edje_object_size_max_get(o, &iww, &ihh); edje_object_size_max_get(o, &iww, &ihh);
icon_w = iww; icon_w = iww;
icon_h = ihh; icon_h = ihh;
} }
} }
if (!mi->icon_object) if (!mi->icon_object)
{ {
@ -2549,18 +2549,18 @@ _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
ev = event_info; ev = event_info;
e_menu_item_active_set(mi, 0); e_menu_item_active_set(mi, 0);
if (_e_menu_activate_maybe_drag) if (_e_menu_activate_maybe_drag)
{ {
if (mi->drag_cb.func) if (mi->drag_cb.func)
{ {
/* User is dragging a draggable item elsewhere. */ /* User is dragging a draggable item elsewhere. */
mi->drag.x = ev->output.x - (ev->output.x - mi->x); mi->drag.x = ev->output.x - (ev->output.x - mi->x);
mi->drag.y = ev->output.y - (ev->output.y - mi->y); mi->drag.y = ev->output.y - (ev->output.y - mi->y);
_e_menu_deactivate_all(); _e_menu_deactivate_all();
mi->drag_cb.func(mi->drag_cb.data, mi->menu, mi); mi->drag_cb.func(mi->drag_cb.data, mi->menu, mi);
} }
/* Either way, the maybe drag stops here. */ /* Either way, the maybe drag stops here. */
_e_menu_activate_maybe_drag = 0; _e_menu_activate_maybe_drag = 0;
} }
} }
static int static int
@ -2654,7 +2654,7 @@ _e_menu_cb_mouse_down(void *data, int type, void *event)
* to start a drag is much more complex. * to start a drag is much more complex.
*/ */
if (_e_menu_activate_floating) if (_e_menu_activate_floating)
_e_menu_activate_maybe_drag = 1; _e_menu_activate_maybe_drag = 1;
return 1; return 1;
} }
@ -2678,11 +2678,11 @@ _e_menu_cb_mouse_up(void *data, int type, void *event)
} }
if (_e_menu_activate_dragging) if (_e_menu_activate_dragging)
{ {
/* FIXME: This is a drop, which is not allowed for now. /* FIXME: This is a drop, which is not allowed for now.
* Once dragging is working, this will be subject to some experimenattion. * Once dragging is working, this will be subject to some experimenattion.
*/ */
} }
else else
ret = _e_menu_active_call(); ret = _e_menu_active_call();
_e_menu_activate_maybe_drag = 0; _e_menu_activate_maybe_drag = 0;