From 68f9e980e7ad0bc7690667adc01facc839c2dbf7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 5 Sep 2013 13:44:34 +0100 Subject: [PATCH] first we check focus model WITHOUT also applying automatically applied raise option, then we check focus option, THEN we check raise option --- src/bin/e_focus.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 550e71daf..aedcd66a6 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -67,24 +67,14 @@ EAPI void e_focus_event_mouse_down(E_Border *bd) { if (e_config->focus_policy == E_FOCUS_CLICK) - { - e_border_focus_set(bd, 1, 1); - - if (!bd->lock_user_stacking) - { - if (e_config->border_raise_on_focus) - e_border_raise(bd); - } - } + e_border_focus_set(bd, 1, 1); + else if (e_config->always_click_to_focus) + e_border_focus_set(bd, 1, 1); else if (e_config->always_click_to_raise) { if (!bd->lock_user_stacking) e_border_raise(bd); } - else if (e_config->always_click_to_focus) - { - e_border_focus_set(bd, 1, 1); - } } EAPI void