Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c e_gadcon.h
Log Message:
instant edit is on a delay timer of 1 sec
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- e_gadcon.c 7 Mar 2008 19:13:53 -0000 1.104
+++ e_gadcon.c 6 May 2008 10:20:53 -0000 1.105
@@ -1328,6 +1328,11 @@
static void
_e_gadcon_client_free(E_Gadcon_Client *gcc)
{
+ if (gcc->instant_edit_timer)
+ {
+ ecore_timer_del(gcc->instant_edit_timer);
+ gcc->instant_edit_timer = NULL;
+ }
if (gcc->o_base)
evas_object_event_callback_del(gcc->o_base,
EVAS_CALLBACK_DEL,
@@ -2229,6 +2234,18 @@
gcc->menu = NULL;
}
+static int
+_e_gadcon_client_cb_instant_edit_timer(void *data)
+{
+ E_Gadcon_Client *gcc;
+
+ gcc = data;
+ e_gadcon_client_edit_begin(gcc);
+ _e_gadcon_client_move_start(gcc);
+ gcc->instant_edit_timer = NULL;
+ return 0;
+}
+
static void
_e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
@@ -2265,9 +2282,10 @@
{
if ((!gcc->o_control) && (gcc->gadcon->instant_edit))
{
- printf("EDIT\n");
- e_gadcon_client_edit_begin(gcc);
- _e_gadcon_client_move_start(gcc);
+ if (gcc->instant_edit_timer)
ecore_timer_del(gcc->instant_edit_timer);
+ gcc->instant_edit_timer =
+ ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer,
+ gcc);
}
}
}
@@ -2283,6 +2301,11 @@
if ((ev->button == 1) && (gcc->gadcon->instant_edit))
{
+ if (gcc->instant_edit_timer)
+ {
+ ecore_timer_del(gcc->instant_edit_timer);
+ gcc->instant_edit_timer = NULL;
+ }
if (gcc->o_control)
{
printf("EDIT END\n");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_gadcon.h 5 Mar 2008 12:39:55 -0000 1.45
+++ e_gadcon.h 6 May 2008 10:20:53 -0000 1.46
@@ -151,6 +151,7 @@
Evas_Coord w, h;
} pad, min, aspect;
Ecore_Timer *scroll_timer;
+ Ecore_Timer *instant_edit_timer;
Ecore_Animator *scroll_animator;
double scroll_pos;
double scroll_wanted;
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
