From 08e1d9a30416afb504b0ccc2f02fd584bd84f2b0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 16 Sep 2015 08:42:59 +0200 Subject: [PATCH 1/3] hardcoded --- qutebrowser/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index b5523fb1a..d59d3b664 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -418,6 +418,7 @@ def _init_modules(args, crash_handler): log.init.debug("Initializing completions...") completionmodels.init() log.init.debug("Misc initialization...") + os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1' _maybe_hide_mouse_cursor() objreg.get('config').changed.connect(_maybe_hide_mouse_cursor) From f83f4a6a1ae4b1a3131e33807ef097563b53a125 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 16 Sep 2015 08:52:51 +0200 Subject: [PATCH 2/3] Add setting. --- doc/help/settings.asciidoc | 12 ++++++++++++ qutebrowser/app.py | 3 ++- qutebrowser/config/configdata.py | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 796199a19..cfdd48e9a 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -47,6 +47,7 @@ |<>|The format to use for the window title. The following placeholders are defined: |<>|Whether to hide the mouse cursor. |<>|Use standard JavaScript modal dialog for alert() and confirm() +|<>|Hide the window decoration when using wayland (requires restart) |============== .Quick reference for section ``network'' @@ -630,6 +631,17 @@ Valid values: Default: +pass:[false]+ +[[ui-hide-wayland-decoration]] +=== hide-wayland-decoration +Hide the window decoration when using wayland (requires restart) + +Valid values: + + * +true+ + * +false+ + +Default: +pass:[false]+ + == network Settings related to the network. diff --git a/qutebrowser/app.py b/qutebrowser/app.py index d59d3b664..3da540a6d 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -418,7 +418,8 @@ def _init_modules(args, crash_handler): log.init.debug("Initializing completions...") completionmodels.init() log.init.debug("Misc initialization...") - os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1' + if config.get('ui', 'hide-wayland-decoration'): + os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1' _maybe_hide_mouse_cursor() objreg.get('config').changed.connect(_maybe_hide_mouse_cursor) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index c9d82838d..e5bfc7146 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -318,6 +318,11 @@ def data(readonly=False): SettingValue(typ.Bool(), 'false'), "Use standard JavaScript modal dialog for alert() and confirm()"), + ('hide-wayland-decoration', + SettingValue(typ.Bool(), 'false'), + "Hide the window decoration when using wayland " + "(requires restart)"), + readonly=readonly )), From 9561b7b02c0ace37bd22702aab848f5545713b58 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 16 Sep 2015 10:23:21 +0200 Subject: [PATCH 3/3] Reset QT_WAYLAND_DISABLE_WINDOWDECORATION. --- qutebrowser/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 3da540a6d..64a116fc2 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -420,6 +420,8 @@ def _init_modules(args, crash_handler): log.init.debug("Misc initialization...") if config.get('ui', 'hide-wayland-decoration'): os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1' + else: + os.environ.pop('QT_WAYLAND_DISABLE_WINDOWDECORATION', None) _maybe_hide_mouse_cursor() objreg.get('config').changed.connect(_maybe_hide_mouse_cursor)