mark public attribute as public, fix debug output
This commit is contained in:
parent
20db65e430
commit
361251bf53
@ -38,7 +38,7 @@ from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate,
|
|||||||
webelem, downloads)
|
webelem, downloads)
|
||||||
from qutebrowser.keyinput import modeman
|
from qutebrowser.keyinput import modeman
|
||||||
from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
|
from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
|
||||||
objreg, utils, typing)
|
objreg, utils, typing, debug)
|
||||||
from qutebrowser.utils.usertypes import KeyMode
|
from qutebrowser.utils.usertypes import KeyMode
|
||||||
from qutebrowser.misc import editor, guiprocess
|
from qutebrowser.misc import editor, guiprocess
|
||||||
from qutebrowser.completion.models import instances, sortfilter
|
from qutebrowser.completion.models import instances, sortfilter
|
||||||
@ -2171,7 +2171,9 @@ class CommandDispatcher:
|
|||||||
|
|
||||||
window = self._tabbed_browser.window()
|
window = self._tabbed_browser.window()
|
||||||
if window.isFullScreen():
|
if window.isFullScreen():
|
||||||
window.setWindowState(window._state_before_fullscreen & ~Qt.WindowFullScreen)
|
window.setWindowState(window.state_before_fullscreen & ~Qt.WindowFullScreen)
|
||||||
else:
|
else:
|
||||||
window._state_before_fullscreen = window.windowState()
|
window.state_before_fullscreen = window.windowState()
|
||||||
window.showFullScreen()
|
window.showFullScreen()
|
||||||
|
log.misc.debug('state before fullscreen: {}'
|
||||||
|
.format(debug.qflags_key(Qt, window.state_before_fullscreen)))
|
||||||
|
@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QSizePolicy
|
|||||||
|
|
||||||
from qutebrowser.commands import runners, cmdutils
|
from qutebrowser.commands import runners, cmdutils
|
||||||
from qutebrowser.config import config
|
from qutebrowser.config import config
|
||||||
from qutebrowser.utils import message, log, usertypes, qtutils, objreg, utils
|
from qutebrowser.utils import message, log, usertypes, qtutils, objreg, utils, debug
|
||||||
from qutebrowser.mainwindow import tabbedbrowser, messageview, prompt
|
from qutebrowser.mainwindow import tabbedbrowser, messageview, prompt
|
||||||
from qutebrowser.mainwindow.statusbar import bar
|
from qutebrowser.mainwindow.statusbar import bar
|
||||||
from qutebrowser.completion import completionwidget, completer
|
from qutebrowser.completion import completionwidget, completer
|
||||||
@ -123,12 +123,12 @@ class MainWindow(QWidget):
|
|||||||
Attributes:
|
Attributes:
|
||||||
status: The StatusBar widget.
|
status: The StatusBar widget.
|
||||||
tabbed_browser: The TabbedBrowser widget.
|
tabbed_browser: The TabbedBrowser widget.
|
||||||
|
state_before_fullscreen: window state before activation of fullscreen.
|
||||||
_downloadview: The DownloadView widget.
|
_downloadview: The DownloadView widget.
|
||||||
_vbox: The main QVBoxLayout.
|
_vbox: The main QVBoxLayout.
|
||||||
_commandrunner: The main CommandRunner instance.
|
_commandrunner: The main CommandRunner instance.
|
||||||
_overlays: Widgets shown as overlay for the current webpage.
|
_overlays: Widgets shown as overlay for the current webpage.
|
||||||
_private: Whether the window is in private browsing mode.
|
_private: Whether the window is in private browsing mode.
|
||||||
_state_before_fullscreen: window state before activation of fullscreen
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, *, private, geometry=None, parent=None):
|
def __init__(self, *, private, geometry=None, parent=None):
|
||||||
@ -218,7 +218,7 @@ class MainWindow(QWidget):
|
|||||||
|
|
||||||
objreg.get("app").new_window.emit(self)
|
objreg.get("app").new_window.emit(self)
|
||||||
|
|
||||||
self._state_before_fullscreen = self.windowState()
|
self.state_before_fullscreen = self.windowState()
|
||||||
|
|
||||||
def _init_geometry(self, geometry):
|
def _init_geometry(self, geometry):
|
||||||
"""Initialize the window geometry or load it from disk."""
|
"""Initialize the window geometry or load it from disk."""
|
||||||
@ -486,12 +486,12 @@ class MainWindow(QWidget):
|
|||||||
@pyqtSlot(bool)
|
@pyqtSlot(bool)
|
||||||
def _on_fullscreen_requested(self, on):
|
def _on_fullscreen_requested(self, on):
|
||||||
if on:
|
if on:
|
||||||
self._state_before_fullscreen = self.windowState()
|
self.state_before_fullscreen = self.windowState()
|
||||||
self.showFullScreen()
|
self.showFullScreen()
|
||||||
else:
|
else:
|
||||||
self.setWindowState(self._state_before_fullscreen)
|
self.setWindowState(self.state_before_fullscreen)
|
||||||
log.misc.debug('on: {}, state before fullscreen: {}'
|
log.misc.debug('on: {}, state before fullscreen: {}'.format(
|
||||||
.format(on, self._state_before_fullscreen))
|
on, debug.qflags_key(Qt, self.state_before_fullscreen)))
|
||||||
|
|
||||||
@cmdutils.register(instance='main-window', scope='window')
|
@cmdutils.register(instance='main-window', scope='window')
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
|
Loading…
Reference in New Issue
Block a user