summaryrefslogtreecommitdiff
path: root/src/modules/winlist
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-12 08:43:46 +0100
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-12 08:43:46 +0100
commitf85afc0646f9cbd841cbab98e5e779e6fd2ed9f2 (patch)
tree34ede520813c9e6b224260fe5e682255f89866e7 /src/modules/winlist
parent7d064ece8608fc3e56350c6cd8325d422bbe7623 (diff)
downloadenlightenment-f85afc0646f9cbd841cbab98e5e779e6fd2ed9f2.tar.gz
fix focus setting when winlisting
Diffstat (limited to 'src/modules/winlist')
-rw-r--r--src/modules/winlist/e_winlist.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index d98b1cea19..6d731676ae 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -991,13 +991,14 @@ _e_winlist_activate(void)
ok = 1;
if (ok)
{
- if ((e_config->winlist_warp_while_selecting) &&
- ((e_config->focus_policy != E_FOCUS_CLICK) ||
- (e_config->winlist_warp_at_end) ||
- (e_config->winlist_warp_while_selecting)))
+ int set = 1;
+ if (e_config->winlist_warp_while_selecting)
{
- if (!e_border_pointer_warp_to_center(ww->border))
- e_border_focus_set(ww->border, 1, 1);
+ if (!e_border_pointer_warp_to_center_now(ww->border))
+ {
+ e_border_focus_set(ww->border, 1, 1);
+ set = 0;
+ }
if (!_animator)
_animator = ecore_animator_add(_e_winlist_animator, NULL);
}
@@ -1011,7 +1012,10 @@ _e_winlist_activate(void)
e_border_raise(ww->border);
if ((!ww->border->lock_focus_out) &&
(e_config->winlist_list_focus_while_selecting))
- e_border_focus_set(ww->border, 1, 0);
+ {
+ e_border_focus_set(ww->border, 1, set);
+ if (set) e_border_focus_set(ww->border, 1, 0);
+ }
}
edje_object_part_text_set(_bg_object, "e.text.label",
e_border_name_get(ww->border));