From a011fc1dd94a0e5c61039e803952430c0b6b38f4 Mon Sep 17 00:00:00 2001 From: Ryuan Choi Date: Mon, 3 Jun 2013 15:47:05 +0900 Subject: [PATCH] edje_entry: password entry should not be selected when doublc clicked or tripple clicked. selection should be allowed when select_allow is true whatever select_mode is. Reproduce step is below. 1. ELM_THEME=default-desktop ELM_PROFILE=standard elementary_test --test-win-only "Entry Scrolled 2. double click on password entry. --- src/lib/edje/edje_entry.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 67458acc0b..96b7e0e333 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -2107,14 +2107,8 @@ _edje_part_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); en->select_mod_start = EINA_FALSE; en->select_mod_end = EINA_FALSE; - if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT) - dosel = EINA_TRUE; - else if ((rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_EXPLICIT) || - (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_BLOCK_HANDLE)) - { - if (en->select_allow) dosel = EINA_TRUE; - } - if (ev->button == 2) dosel = EINA_FALSE; + + if (en->select_allow && ev->button != 2) dosel = EINA_TRUE; if (dosel) { evas_object_geometry_get(rp->object, &x, &y, &w, &h); @@ -2280,10 +2274,7 @@ _edje_part_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ { en->selecting = EINA_TRUE; _sel_clear(en->ed, en->cursor, rp->object, en); - if (en->select_allow) - { - _sel_start(en->cursor, rp->object, en); - } + _sel_start(en->cursor, rp->object, en); } } }