From 3494f7db73fc0a395b6614b33d4f1b6abfcb1c65 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 23 Aug 2012 09:09:58 +0000 Subject: [PATCH] revert previous commit, ticket #daniel lied to me SVN revision: 75609 --- src/bin/e_border.c | 9 ++++++++- src/modules/winlist/e_winlist.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 183d14e25..61b0a88c7 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2088,7 +2088,14 @@ e_border_focus_set_with_pointer(E_Border *bd) if (e_config->focus_policy == E_FOCUS_CLICK) return; if (!bd->visible) return; - if (e_config->focus_policy == E_FOCUS_MOUSE) + if (e_config->focus_policy == E_FOCUS_SLOPPY) + { + if (!e_border_under_pointer_get(bd->desk, bd)) + { + e_border_pointer_warp_to_center(bd); + } + } + else { e_border_pointer_warp_to_center(bd); } diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index ade55d1a0..c443b5bc9 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -337,7 +337,7 @@ e_winlist_hide(void) e_border_focus_set(bd, 1, 1); e_border_focus_latest_set(bd); } - if ((e_config->focus_policy == E_FOCUS_MOUSE) || + if ((e_config->focus_policy != E_FOCUS_CLICK) || (e_config->winlist_warp_at_end) || (e_config->winlist_warp_while_selecting)) ecore_x_pointer_warp(bd->zone->container->win, _warp_to_x, _warp_to_y);