NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

entry - fix menu to not popup after every time mobile sel handles are clicked 

this fixes a behavior bug in entry @fix cherry-pick-me
This commit is contained in:
Carsten Haitzler 2014-03-06 20:12:58 +09:00
parent fcd164b4b0
commit 0871e2d2fe
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/elementary/src/lib/elm_entry.c
View File

@ -1622,7 +1622,6 @@ _mouse_down_cb(void *data,
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->longpress_timer = ecore_timer_add
(_elm_config->longpress_timeout, _long_press_cb, data);
sd->long_pressed = EINA_FALSE;
}
else if (ev->button == 3)
{
@ -3072,6 +3071,8 @@ _start_handler_mouse_down_cb(void *data,
sd->ox = ev->canvas.x - (ex + cx + (cw / 2));
sd->oy = ev->canvas.y - (ey + cy + (ch / 2));
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE;
if (_elm_config->magnifier_enable)
{
_magnifier_create(data);
@ -3091,7 +3092,7 @@ _start_handler_mouse_up_cb(void *data,
sd->start_handler_down = EINA_FALSE;
if (_elm_config->magnifier_enable)
_magnifier_hide(data);
if (!_elm_config->desktop_entry)
if ((!_elm_config->desktop_entry) && (sd->long_pressed))
_menu_call(data);
}
@ -3123,6 +3124,8 @@ _start_handler_mouse_move_cb(void *data,
edje_object_part_text_cursor_geometry_get(sd->entry_edje,
"elm.text",
&cx, &cy, NULL, &ch);
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE;
if (_elm_config->magnifier_enable)
_magnifier_move(data, ex + cx, ey + cy + (ch / 2));
}
@ -3167,6 +3170,8 @@ _end_handler_mouse_down_cb(void *data,
sd->ox = ev->canvas.x - (ex + cx + (cw / 2));
sd->oy = ev->canvas.y - (ey + cy + (ch / 2));
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE;
if (_elm_config->magnifier_enable)
{
_magnifier_create(data);
@ -3186,7 +3191,7 @@ _end_handler_mouse_up_cb(void *data,
sd->end_handler_down = EINA_FALSE;
if (_elm_config->magnifier_enable)
_magnifier_hide(data);
if (!_elm_config->desktop_entry)
if ((!_elm_config->desktop_entry) && (sd->long_pressed))
_menu_call(data);
}
@ -3218,6 +3223,8 @@ _end_handler_mouse_move_cb(void *data,
edje_object_part_text_cursor_geometry_get(sd->entry_edje,
"elm.text",
&cx, &cy, NULL, &ch);
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE;
if (_elm_config->magnifier_enable)
_magnifier_move(data, ex + cx, ey + cy + (ch / 2));
}