From 559059d244ccf95c56bd1c6f982f700ce13aa038 Mon Sep 17 00:00:00 2001 From: Christian Helbling Date: Fri, 12 Jan 2018 11:21:55 +0100 Subject: [PATCH] simplify code - state_before_fullscreen seems not to be needed anymore --- qutebrowser/browser/commands.py | 8 ++------ qutebrowser/mainwindow/mainwindow.py | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 34b7fa340..139ed93fc 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -2197,10 +2197,6 @@ class CommandDispatcher: window = self._tabbed_browser.window() if window.isFullScreen(): - window.setWindowState( - window.state_before_fullscreen & ~Qt.WindowFullScreen) + window.setWindowState(window.windowState() & ~Qt.WindowFullScreen) else: - window.state_before_fullscreen = window.windowState() - window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen) - log.misc.debug('state before fullscreen: {}'.format( - debug.qflags_key(Qt, window.state_before_fullscreen))) + window.setWindowState(window.windowState() | Qt.WindowFullScreen) diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index e853c3ea8..726a2f152 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -134,7 +134,6 @@ class MainWindow(QWidget): Attributes: status: The StatusBar widget. tabbed_browser: The TabbedBrowser widget. - state_before_fullscreen: window state before activation of fullscreen. _downloadview: The DownloadView widget. _vbox: The main QVBoxLayout. _commandrunner: The main CommandRunner instance. @@ -234,8 +233,6 @@ class MainWindow(QWidget): objreg.get("app").new_window.emit(self) - self.state_before_fullscreen = self.windowState() - def _init_geometry(self, geometry): """Initialize the window geometry or load it from disk.""" if geometry is not None: @@ -497,12 +494,9 @@ class MainWindow(QWidget): def _on_fullscreen_requested(self, on): if not config.val.content.windowed_fullscreen: if on: - self.state_before_fullscreen = self.windowState() - self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen) + self.setWindowState(self.windowState() | Qt.WindowFullScreen) elif self.isFullScreen(): - self.setWindowState(self.state_before_fullscreen) - log.misc.debug('on: {}, state before fullscreen: {}'.format( - on, debug.qflags_key(Qt, self.state_before_fullscreen))) + self.setWindowState(self.windowState() & ~Qt.WindowFullScreen) @cmdutils.register(instance='main-window', scope='window') @pyqtSlot()