[EGIT] [core/elementary] master 02/03: combobox: fix continuous clicks on hover

[Divyesh Purohit]

cedric pushed a commit to branch master.

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

commit f4ee3f5f0e90046fe9c1b986ea0078a6e3967d84
Author: Divyesh Purohit <purohit....@gmail.com>
Date:   Tue Jan 26 13:01:03 2016 -0800

    combobox: fix continuous clicks on hover
    
    Summary:
    Continouous clicks on hover would need to ensure that variable
    on_dismiss of combobox_vertical style in hover.edc should 0 when slot is 
being shown, otherwise events
    would be disabled on hover even though swallow content is shown.
    
    @fix
    
    Signed-off-by: Divyesh Purohit <purohit....@gmail.com>
    
    Test Plan:
    Click continouosly on combobox and events on hover would be
    disabled.
    
    Reviewers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D3601
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 data/themes/edc/elm/hover.edc | 2 ++
 src/lib/elc_combobox.c        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/themes/edc/elm/hover.edc b/data/themes/edc/elm/hover.edc
index 229fa8d..2cd7c0a 100644
--- a/data/themes/edc/elm/hover.edc
+++ b/data/themes/edc/elm/hover.edc
@@ -479,6 +479,7 @@ group { name: "elm/hover/base/hoversel_vertical/default";
          else
             run_program(PROGRAM:"topshow_right");
          set_int(visible, 1);
+         set_int(on_dismiss, 0);
       }
       public bottomshow2() {
          if (get_int(right) == 0)
@@ -486,6 +487,7 @@ group { name: "elm/hover/base/hoversel_vertical/default";
          else
             run_program(PROGRAM:"bottomshow_right");
          set_int(visible, 1);
+         set_int(on_dismiss, 0);
       }
    }
    parts {
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index c00c772..fbe0f1c 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -225,7 +225,7 @@ _gl_filter_finished_cb(void *data, Eo *obj EINA_UNUSED,
 
    if (sd->count > 0)
      {
-         if (!sd->expanded) _activate(data);
+        if (!sd->expanded) _activate(data);
         else _table_resize(data);
      }
    else elm_combobox_hover_end(data);
@@ -237,7 +237,7 @@ _on_aborted(void *data, Eo *obj EINA_UNUSED,
             const Eo_Event_Description *desc EINA_UNUSED, void *event_info 
EINA_UNUSED)
 {
    ELM_COMBOBOX_DATA_GET(data, sd);
-   if (sd->expanded == EINA_TRUE) elm_combobox_hover_end(data);
+   if (sd->expanded) elm_combobox_hover_end(data);
    return EINA_TRUE;
 }
 

--