summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-06 20:12:58 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-06 20:15:16 +0900
commitacecd21fc44c9533fe1c8aaa7592d55e6bb12b80 (patch)
tree03d23cb570449a18d3314e8b8b6c9a88e5f278c5
parentd57cda07c48741779bc8c1384afcd422c327a338 (diff)
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
-rw-r--r--src/lib/elm_entry.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index ab4de25bf..c995522cb 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1622,7 +1622,6 @@ _mouse_down_cb(void *data,
1622 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); 1622 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
1623 sd->longpress_timer = ecore_timer_add 1623 sd->longpress_timer = ecore_timer_add
1624 (_elm_config->longpress_timeout, _long_press_cb, data); 1624 (_elm_config->longpress_timeout, _long_press_cb, data);
1625 sd->long_pressed = EINA_FALSE;
1626 } 1625 }
1627 else if (ev->button == 3) 1626 else if (ev->button == 3)
1628 { 1627 {
@@ -3072,6 +3071,8 @@ _start_handler_mouse_down_cb(void *data,
3072 sd->ox = ev->canvas.x - (ex + cx + (cw / 2)); 3071 sd->ox = ev->canvas.x - (ex + cx + (cw / 2));
3073 sd->oy = ev->canvas.y - (ey + cy + (ch / 2)); 3072 sd->oy = ev->canvas.y - (ey + cy + (ch / 2));
3074 3073
3074 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
3075 sd->long_pressed = EINA_FALSE;
3075 if (_elm_config->magnifier_enable) 3076 if (_elm_config->magnifier_enable)
3076 { 3077 {
3077 _magnifier_create(data); 3078 _magnifier_create(data);
@@ -3091,7 +3092,7 @@ _start_handler_mouse_up_cb(void *data,
3091 sd->start_handler_down = EINA_FALSE; 3092 sd->start_handler_down = EINA_FALSE;
3092 if (_elm_config->magnifier_enable) 3093 if (_elm_config->magnifier_enable)
3093 _magnifier_hide(data); 3094 _magnifier_hide(data);
3094 if (!_elm_config->desktop_entry) 3095 if ((!_elm_config->desktop_entry) && (sd->long_pressed))
3095 _menu_call(data); 3096 _menu_call(data);
3096} 3097}
3097 3098
@@ -3123,6 +3124,8 @@ _start_handler_mouse_move_cb(void *data,
3123 edje_object_part_text_cursor_geometry_get(sd->entry_edje, 3124 edje_object_part_text_cursor_geometry_get(sd->entry_edje,
3124 "elm.text", 3125 "elm.text",
3125 &cx, &cy, NULL, &ch); 3126 &cx, &cy, NULL, &ch);
3127 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
3128 sd->long_pressed = EINA_FALSE;
3126 if (_elm_config->magnifier_enable) 3129 if (_elm_config->magnifier_enable)
3127 _magnifier_move(data, ex + cx, ey + cy + (ch / 2)); 3130 _magnifier_move(data, ex + cx, ey + cy + (ch / 2));
3128} 3131}
@@ -3167,6 +3170,8 @@ _end_handler_mouse_down_cb(void *data,
3167 sd->ox = ev->canvas.x - (ex + cx + (cw / 2)); 3170 sd->ox = ev->canvas.x - (ex + cx + (cw / 2));
3168 sd->oy = ev->canvas.y - (ey + cy + (ch / 2)); 3171 sd->oy = ev->canvas.y - (ey + cy + (ch / 2));
3169 3172
3173 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
3174 sd->long_pressed = EINA_FALSE;
3170 if (_elm_config->magnifier_enable) 3175 if (_elm_config->magnifier_enable)
3171 { 3176 {
3172 _magnifier_create(data); 3177 _magnifier_create(data);
@@ -3186,7 +3191,7 @@ _end_handler_mouse_up_cb(void *data,
3186 sd->end_handler_down = EINA_FALSE; 3191 sd->end_handler_down = EINA_FALSE;
3187 if (_elm_config->magnifier_enable) 3192 if (_elm_config->magnifier_enable)
3188 _magnifier_hide(data); 3193 _magnifier_hide(data);
3189 if (!_elm_config->desktop_entry) 3194 if ((!_elm_config->desktop_entry) && (sd->long_pressed))
3190 _menu_call(data); 3195 _menu_call(data);
3191} 3196}
3192 3197
@@ -3218,6 +3223,8 @@ _end_handler_mouse_move_cb(void *data,
3218 edje_object_part_text_cursor_geometry_get(sd->entry_edje, 3223 edje_object_part_text_cursor_geometry_get(sd->entry_edje,
3219 "elm.text", 3224 "elm.text",
3220 &cx, &cy, NULL, &ch); 3225 &cx, &cy, NULL, &ch);
3226 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
3227 sd->long_pressed = EINA_FALSE;
3221 if (_elm_config->magnifier_enable) 3228 if (_elm_config->magnifier_enable)
3222 _magnifier_move(data, ex + cx, ey + cy + (ch / 2)); 3229 _magnifier_move(data, ex + cx, ey + cy + (ch / 2));
3223} 3230}