summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubodh Kumar <s7158.kumar@samsung.com>2015-12-23 13:03:45 +0000
committerTom Hacohen <tom@stosb.com>2015-12-23 13:05:11 +0000
commit319d80dd2bb26f109b2dfa942fa878481e01381f (patch)
tree2ae04331dfbae87fd0bea47f7f0b65a5eb9632c0
parent193568f7e3b35b6dc8f44d8a2d6eeaacd87f374c (diff)
Elm entry: Fix to hide magnifier when menu is disabled.
Summary: Fix to hide magnifier when menu is disabled @fix Test Plan: 1. Enable magnifier 2. Disable menu 3. Long press and mouse up 4. observe magnifier is not hidden. Reviewers: tasn, herdsman, thiepha Subscribers: shilpasingh Differential Revision: https://phab.enlightenment.org/D3490
-rw-r--r--src/lib/elm_entry.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b7c953d9d..811d6f64c 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1857,11 +1857,13 @@ _mouse_up_cb(void *data,
1857 /* Since context menu disabled flag was checked at long press start while mouse 1857 /* Since context menu disabled flag was checked at long press start while mouse
1858 * down, hence the same should be checked at mouse up from a long press 1858 * down, hence the same should be checked at mouse up from a long press
1859 * as well */ 1859 * as well */
1860 if ((sd->long_pressed) && (!_elm_config->context_menu_disabled) && 1860 if ((sd->long_pressed) && (_elm_config->magnifier_enable))
1861 (_elm_config->magnifier_enable))
1862 { 1861 {
1863 _magnifier_hide(data); 1862 _magnifier_hide(data);
1864 _menu_call(data); 1863 if (!_elm_config->context_menu_disabled)
1864 {
1865 _menu_call(data);
1866 }
1865 } 1867 }
1866 else 1868 else
1867 { 1869 {