diff options
| author | Victor Kareh <[email protected]> | 2019-05-21 14:35:03 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-16 18:12:44 +0200 |
| commit | d2368802022cad0877a7c574f8d8b872e6cac227 (patch) | |
| tree | d5cf73a0420c28e769c8c7b2114fe12e82be39d4 | |
| parent | 8a993a8f1f4dc161d41d44f5c0c1485a9041f7f5 (diff) | |
| download | marco-d2368802022cad0877a7c574f8d8b872e6cac227.tar.bz2 marco-d2368802022cad0877a7c574f8d8b872e6cac227.tar.xz | |
Allow raise_on_click to be set independent of focus_mode
Based on a patch by Thomas Jaeger <[email protected]>
upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/03e8e63d
| -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 85b7d5cb..807d60e6 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -271,8 +271,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay, meta_window_lower (window); - if (meta_prefs_get_focus_mode () == META_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 81ce07b9..b0cf51c9 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -1084,10 +1084,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 == META_FOCUS_MODE_CLICK; + return raise_on_click; } const char* |