instant edit is on a delay timer of 1 sec
SVN revision: 34479
This commit is contained in:
parent
d9c072ea86
commit
56865b731c
|
@ -1328,6 +1328,11 @@ _e_gadcon_free(E_Gadcon *gc)
|
||||||
static void
|
static void
|
||||||
_e_gadcon_client_free(E_Gadcon_Client *gcc)
|
_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)
|
if (gcc->o_base)
|
||||||
evas_object_event_callback_del(gcc->o_base,
|
evas_object_event_callback_del(gcc->o_base,
|
||||||
EVAS_CALLBACK_DEL,
|
EVAS_CALLBACK_DEL,
|
||||||
|
@ -2229,6 +2234,18 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m)
|
||||||
gcc->menu = NULL;
|
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
|
static void
|
||||||
_e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
|
@ -2265,9 +2282,10 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
|
||||||
{
|
{
|
||||||
if ((!gcc->o_control) && (gcc->gadcon->instant_edit))
|
if ((!gcc->o_control) && (gcc->gadcon->instant_edit))
|
||||||
{
|
{
|
||||||
printf("EDIT\n");
|
if (gcc->instant_edit_timer) ecore_timer_del(gcc->instant_edit_timer);
|
||||||
e_gadcon_client_edit_begin(gcc);
|
gcc->instant_edit_timer =
|
||||||
_e_gadcon_client_move_start(gcc);
|
ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer,
|
||||||
|
gcc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2283,6 +2301,11 @@ _e_gadcon_client_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_
|
||||||
|
|
||||||
if ((ev->button == 1) && (gcc->gadcon->instant_edit))
|
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)
|
if (gcc->o_control)
|
||||||
{
|
{
|
||||||
printf("EDIT END\n");
|
printf("EDIT END\n");
|
||||||
|
|
|
@ -151,6 +151,7 @@ struct _E_Gadcon_Client
|
||||||
Evas_Coord w, h;
|
Evas_Coord w, h;
|
||||||
} pad, min, aspect;
|
} pad, min, aspect;
|
||||||
Ecore_Timer *scroll_timer;
|
Ecore_Timer *scroll_timer;
|
||||||
|
Ecore_Timer *instant_edit_timer;
|
||||||
Ecore_Animator *scroll_animator;
|
Ecore_Animator *scroll_animator;
|
||||||
double scroll_pos;
|
double scroll_pos;
|
||||||
double scroll_wanted;
|
double scroll_wanted;
|
||||||
|
|
Loading…
Reference in New Issue