Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Let the user decide the object for a drag.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_mod_main.c 10 May 2005 22:05:02 -0000 1.46
+++ e_mod_main.c 11 May 2005 06:30:57 -0000 1.47
@@ -1245,13 +1245,17 @@
if (dist > 10)
{
E_Drag *d;
+ Evas_Object *o;
drag = 1;
drag_start = 0;
d = e_drag_new(ic->ibb->con,
- "enlightenment/eapp", ic->app,
_ibar_bar_cb_finished,
- ic->app->path, "icon");
+ "enlightenment/eapp", ic->app,
_ibar_bar_cb_finished);
+ o = edje_object_add(e_drag_evas_get(d));
+ edje_object_file_set(o, ic->app->path, "icon");
+ e_drag_object_set(d, o);
+
e_drag_resize(d, ic->ibb->ibar->conf->iconsize,
ic->ibb->ibar->conf->iconsize);
e_drag_start(d);
evas_event_feed_mouse_up(ic->ibb->evas, 1, EVAS_BUTTON_NONE, NULL);
@@ -1433,6 +1437,9 @@
iw = h / (double) evas_list_count(ibb->icons);
pos = round(y / iw);
}
+ else
+ return;
+
ic = evas_list_nth(ibb->icons, pos);
e_box_freeze(ibb->box_object);
@@ -1519,6 +1526,9 @@
iw = h / (double) evas_list_count(ibb->icons);
pos = round(y / iw);
}
+ else
+ return;
+
ic = evas_list_nth(ibb->icons, pos);
if (ic)
{
@@ -1562,10 +1572,10 @@
_ibar_bar_follower_reset(ibb);
_ibar_bar_timer_handle(ibb);
- ibb->drop_handler->x = ibb->x + ibb->inset.l;
- ibb->drop_handler->y = ibb->y + ibb->inset.t;
- ibb->drop_handler->w = ibb->w - (ibb->inset.l + ibb->inset.r);
- ibb->drop_handler->h = ibb->h - (ibb->inset.t + ibb->inset.b);
+ e_drop_handler_geometry_set(ibb->drop_handler,
+ ibb->x + ibb->inset.l, ibb->y +
ibb->inset.t,
+ ibb->w - (ibb->inset.l + ibb->inset.r),
+ ibb->h - (ibb->inset.t + ibb->inset.b));
break;
case E_GADMAN_CHANGE_EDGE:
_ibar_bar_edge_change(ibb, e_gadman_client_edge_get(ibb->gmc));
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs