summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2013-07-03 13:12:30 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-07-03 13:13:11 +0900
commitdbfd56f98ed769bc0962a7ad57b42c285a9dd82c (patch)
treed4eea29e5d040c59c2410bf4300adbc6d33c7565 /legacy/elementary
parent758d01ef99b55a56a4e0eaf89642fe82df6b73e8 (diff)
[Entry] Avoid showing multiple popups on one entry.
Multiple popups (anchor hover and hoversel) are showing in following cases: - Run elementary_test with Mobile profile --> Entry Anchor + click on anchor to show hover, then press menu key + right click on anchor
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/ChangeLog5
-rw-r--r--legacy/elementary/NEWS1
-rw-r--r--legacy/elementary/src/lib/elm_entry.c3
3 files changed, 9 insertions, 0 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 06dc04bcbb..530b9bfe1b 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1473,3 +1473,8 @@
1473 1473
1474 * Add the elm_scrollable_interface_content_viewport_resize_cb_set. 1474 * Add the elm_scrollable_interface_content_viewport_resize_cb_set.
1475 When the viewport is resized, the enrolled function is called. 1475 When the viewport is resized, the enrolled function is called.
1476
14772013-07-03 Thiep Ha
1478
1479 * Fix bug of showing multiple popups in Entry.
1480
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index e4769549f2..a3fa7323f8 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -254,6 +254,7 @@ Fixes:
254 * Block mouse events when the ctxpopup on dismiss. 254 * Block mouse events when the ctxpopup on dismiss.
255 * Fix crash of elm_notify when timeout is zero. 255 * Fix crash of elm_notify when timeout is zero.
256 * Fix Segfault in elementary file_selector_example when closed 256 * Fix Segfault in elementary file_selector_example when closed
257 * Fix Showing multiple popups in Entry.
257 258
258Removals: 259Removals:
259 260
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 2f44f25ef7..80fb84b935 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -1241,6 +1241,7 @@ _menu_call(Evas_Object *obj)
1241 1241
1242 ELM_ENTRY_DATA_GET(obj, sd); 1242 ELM_ENTRY_DATA_GET(obj, sd);
1243 1243
1244 if (sd->anchor_hover.hover) return;
1244 if ((sd->api) && (sd->api->obj_longpress)) 1245 if ((sd->api) && (sd->api->obj_longpress))
1245 { 1246 {
1246 sd->api->obj_longpress(obj); 1247 sd->api->obj_longpress(obj);
@@ -2042,6 +2043,8 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2042 2043
2043 ELM_ENTRY_DATA_GET(obj, sd); 2044 ELM_ENTRY_DATA_GET(obj, sd);
2044 2045
2046 if (sd->hoversel) return;
2047
2045 ei.anchor_info = info; 2048 ei.anchor_info = info;
2046 2049
2047 sd->anchor_hover.pop = elm_icon_add(obj); 2050 sd->anchor_hover.pop = elm_icon_add(obj);