summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDivyesh Purohit <purohit.div@gmail.com>2016-01-26 13:01:03 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-26 13:05:28 -0800
commitf4ee3f5f0e90046fe9c1b986ea0078a6e3967d84 (patch)
tree28bba92fcef9d5e57f983cdebf509aa9d7e0f398
parent186aeb42eb7e97c07a58a30aafbca5d05c4e2302 (diff)
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.div@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 <cedric@osg.samsung.com>
-rw-r--r--data/themes/edc/elm/hover.edc2
-rw-r--r--src/lib/elc_combobox.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/data/themes/edc/elm/hover.edc b/data/themes/edc/elm/hover.edc
index 229fa8d79..2cd7c0a82 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";
479 else 479 else
480 run_program(PROGRAM:"topshow_right"); 480 run_program(PROGRAM:"topshow_right");
481 set_int(visible, 1); 481 set_int(visible, 1);
482 set_int(on_dismiss, 0);
482 } 483 }
483 public bottomshow2() { 484 public bottomshow2() {
484 if (get_int(right) == 0) 485 if (get_int(right) == 0)
@@ -486,6 +487,7 @@ group { name: "elm/hover/base/hoversel_vertical/default";
486 else 487 else
487 run_program(PROGRAM:"bottomshow_right"); 488 run_program(PROGRAM:"bottomshow_right");
488 set_int(visible, 1); 489 set_int(visible, 1);
490 set_int(on_dismiss, 0);
489 } 491 }
490 } 492 }
491 parts { 493 parts {
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index c00c77283..fbe0f1cd1 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,
225 225
226 if (sd->count > 0) 226 if (sd->count > 0)
227 { 227 {
228 if (!sd->expanded) _activate(data); 228 if (!sd->expanded) _activate(data);
229 else _table_resize(data); 229 else _table_resize(data);
230 } 230 }
231 else elm_combobox_hover_end(data); 231 else elm_combobox_hover_end(data);
@@ -237,7 +237,7 @@ _on_aborted(void *data, Eo *obj EINA_UNUSED,
237 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 237 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
238{ 238{
239 ELM_COMBOBOX_DATA_GET(data, sd); 239 ELM_COMBOBOX_DATA_GET(data, sd);
240 if (sd->expanded == EINA_TRUE) elm_combobox_hover_end(data); 240 if (sd->expanded) elm_combobox_hover_end(data);
241 return EINA_TRUE; 241 return EINA_TRUE;
242} 242}
243 243