changed setting name and reverted non-issue fix
This commit is contained in:
parent
4419e59d46
commit
ea70a0dea1
@ -259,11 +259,11 @@ content.default_encoding:
|
||||
The encoding must be a string describing an encoding such as _utf-8_,
|
||||
_iso-8859-1_, etc.
|
||||
|
||||
content.desktop_fullscreen:
|
||||
content.windowed_fullscreen:
|
||||
type: Bool
|
||||
default: true
|
||||
default: false
|
||||
desc: >-
|
||||
Allow fullscreen to cover the entire desktop.
|
||||
Limit fullscreen to the browser window (does not expand to fill the screen).
|
||||
|
||||
content.developer_extras:
|
||||
type: Bool
|
||||
|
@ -491,14 +491,12 @@ class MainWindow(QWidget):
|
||||
|
||||
@pyqtSlot(bool)
|
||||
def _on_fullscreen_requested(self, on):
|
||||
if on:
|
||||
self.window_state_before_fullscreen = self.windowState()
|
||||
self.config_state_before_fullscreen = config.val.content.desktop_fullscreen
|
||||
if config.val.content.desktop_fullscreen:
|
||||
if not config.val.content.windowed_fullscreen:
|
||||
if on:
|
||||
self.state_before_fullscreen = self.windowState()
|
||||
self.showFullScreen()
|
||||
elif self.isFullScreen():
|
||||
if config.val.content.desktop_fullscreen or self.config_state_before_fullscreen:
|
||||
self.setWindowState(self.window_state_before_fullscreen)
|
||||
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)))
|
||||
|
||||
|
@ -300,10 +300,10 @@ class FullscreenNotification(QLabel):
|
||||
self.setText("Page is now fullscreen.")
|
||||
|
||||
self.resize(self.sizeHint())
|
||||
if config.val.content.desktop_fullscreen:
|
||||
geom = QApplication.desktop().screenGeometry(self)
|
||||
else:
|
||||
if config.val.content.windowed_fullscreen:
|
||||
geom = self.parentWidget().geometry()
|
||||
else:
|
||||
geom = QApplication.desktop().screenGeometry(self)
|
||||
self.move((geom.width() - self.sizeHint().width()) / 2, 30)
|
||||
|
||||
def set_timeout(self, timeout):
|
||||
|
Loading…
Reference in New Issue
Block a user