diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-12-28 22:36:27 -0800 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2015-01-07 13:28:11 +0200 |
| commit | 03e8e63d6accd26f47025ba23d295de910f9f989 (patch) | |
| tree | 81bf0506e7865f6d4bd96257e33f399e305fc790 | |
| parent | 8da07c310d9743a1b98db5fd3b2e7c79d787f195 (diff) | |
| download | metacity-03e8e63d6accd26f47025ba23d295de910f9f989.tar.gz | |
Allow raise_on_click to be set independent of focus_mode
Based on a patch by Thomas Jaeger <ThJaeger@gmail.com>
| -rw-r--r-- | src/core/core.c | 3 | ||||
| -rw-r--r-- | 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 5b56ab61..7153c1f8 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -269,8 +269,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay, meta_window_lower (window); - 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 3820ba90..133f4243 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -924,10 +924,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; } const char* |