From 93b7137c62810460d65acaeab20cb08973d370b5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 28 Dec 2014 22:36:27 -0800 Subject: [PATCH] Allow raise_on_click to be set independent of focus_mode Based on a patch by Thomas Jaeger --- src/core/core.c | 3 +-- src/core/prefs.c | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/core.c b/src/core/core.c index e603af817..e31f7e367 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -161,8 +161,7 @@ lower_window_and_transients (MetaWindow *window, meta_window_foreach_transient (window, lower_window_and_transients, NULL); - if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK && - meta_prefs_get_raise_on_click ()) + if (meta_prefs_get_raise_on_click ()) { /* Move window to the back of the focusing workspace's MRU list. * Do extra sanity checks to avoid possible race conditions. diff --git a/src/core/prefs.c b/src/core/prefs.c index afbe8ddf9..fff3a3299 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -1300,10 +1300,7 @@ meta_prefs_get_attach_modal_dialogs (void) gboolean meta_prefs_get_raise_on_click (void) { - /* Force raise_on_click on for click-to-focus, as requested by Havoc - * in #326156. - */ - return raise_on_click || focus_mode == G_DESKTOP_FOCUS_MODE_CLICK; + return raise_on_click; } gboolean