Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/entangle
Modified Files:
TODO entangle_ui.c
Log Message:
- patch from Mathieu Lamar (sativas) to fixup the problem with clicking on the
arrows and having the eapp be selected
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- TODO 26 May 2005 01:23:55 -0000 1.5
+++ TODO 3 Jun 2005 15:54:12 -0000 1.6
@@ -2,14 +2,11 @@
* someway to attach .directory.eapp files to directories
* directory renaming?
-* if an eapp is under the arrows in the left menu it will be clicked when
- you click the arrow
* need to handle directories that aren't in the .order file. They come at
the end of the list
-* can also ahve .eapps in the directory that aren't in the .order file (I
- think).
+* need to handle eapps that aren't in the .order file too
* E17 will look for the .eapp in the directory first before checking the all
- directory (i think).
+ directory.
* need to add monitoring of the .order files and the top directories
- if something changes need to popup a warning to the user and ask if
they want to reload the .order file
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- entangle_ui.c 26 May 2005 00:34:22 -0000 1.7
+++ entangle_ui.c 3 Jun 2005 15:54:12 -0000 1.8
@@ -676,25 +676,30 @@
Evas_Object *o;
Evas_Event_Mouse_Down *e;
Entangle_Eapp *eapp;
+ Evas_Coord y, h;
e = ev;
eapp = data;
- /* XXX check we're not over the arrows */
-
- o = edje_object_add(evas);
- edje_object_file_set(o, eapp->path, "icon");
- evas_object_move(o, e->canvas.x - 18, e->canvas.y - 18);
- evas_object_resize(o, 36, 36);
- evas_object_layer_set(o, 2);
- evas_object_color_set(o, 255, 255, 255, 198);
- evas_object_show(o);
+ o = evas_object_name_find(evas, "edje");
+ edje_object_part_geometry_get(o, "eapps_bar", NULL, &y, NULL, &h);
- evas_object_data_set(o, "eapp", eapp);
- evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,
- entangle_ui_cb_mouse_move, o);
- evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
- entangle_ui_cb_mouse_up, o);
+ if ((e->canvas.y > y) && (e->canvas.y < (y + h)))
+ {
+ o = edje_object_add(evas);
+ edje_object_file_set(o, eapp->path, "icon");
+ evas_object_move(o, e->canvas.x - 18, e->canvas.y - 18);
+ evas_object_resize(o, 36, 36);
+ evas_object_layer_set(o, 2);
+ evas_object_color_set(o, 255, 255, 255, 198);
+ evas_object_show(o);
+
+ evas_object_data_set(o, "eapp", eapp);
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,
+ entangle_ui_cb_mouse_move, o);
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
+ entangle_ui_cb_mouse_up, o);
+ }
}
static void
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
