[EGIT] [core/elementary] master 01/01: Elm entry: Fix to hide magnifier when menu is disabled.

[Subodh Kumar]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=319d80dd2bb26f109b2dfa942fa878481e01381f

commit 319d80dd2bb26f109b2dfa942fa878481e01381f
Author: Subodh Kumar <s7158.ku...@samsung.com>
Date:   Wed Dec 23 13:03:45 2015 +0000

    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
---
 src/lib/elm_entry.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b7c953d..811d6f6 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1857,11 +1857,13 @@ _mouse_up_cb(void *data,
         /* Since context menu disabled flag was checked at long press start 
while mouse
          * down, hence the same should be checked at mouse up from a long press
          * as well */
-        if ((sd->long_pressed) && (!_elm_config->context_menu_disabled) &&
-            (_elm_config->magnifier_enable))
+        if ((sd->long_pressed) && (_elm_config->magnifier_enable))
           {
              _magnifier_hide(data);
-             _menu_call(data);
+             if (!_elm_config->context_menu_disabled)
+               {
+                  _menu_call(data);
+               }
           }
         else
           {

--