raster pushed a commit to branch master.
commit a011fc1dd94a0e5c61039e803952430c0b6b38f4
Author: Ryuan Choi <[email protected]>
Date: Mon Jun 3 15:47:05 2013 +0900
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 67458ac..96b7e0e 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);
}
}
}
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
