Merge remote-tracking branch 'origin/pr/3285'
This commit is contained in:
commit
ea71f0e318
@ -259,6 +259,12 @@ content.default_encoding:
|
|||||||
The encoding must be a string describing an encoding such as _utf-8_,
|
The encoding must be a string describing an encoding such as _utf-8_,
|
||||||
_iso-8859-1_, etc.
|
_iso-8859-1_, etc.
|
||||||
|
|
||||||
|
content.windowed_fullscreen:
|
||||||
|
type: Bool
|
||||||
|
default: false
|
||||||
|
desc: >-
|
||||||
|
Limit fullscreen to the browser window (does not expand to fill the screen).
|
||||||
|
|
||||||
content.developer_extras:
|
content.developer_extras:
|
||||||
type: Bool
|
type: Bool
|
||||||
default: false
|
default: false
|
||||||
|
@ -491,11 +491,12 @@ class MainWindow(QWidget):
|
|||||||
|
|
||||||
@pyqtSlot(bool)
|
@pyqtSlot(bool)
|
||||||
def _on_fullscreen_requested(self, on):
|
def _on_fullscreen_requested(self, on):
|
||||||
if on:
|
if not config.val.content.windowed_fullscreen:
|
||||||
self.state_before_fullscreen = self.windowState()
|
if on:
|
||||||
self.showFullScreen()
|
self.state_before_fullscreen = self.windowState()
|
||||||
elif self.isFullScreen():
|
self.showFullScreen()
|
||||||
self.setWindowState(self.state_before_fullscreen)
|
elif self.isFullScreen():
|
||||||
|
self.setWindowState(self.state_before_fullscreen)
|
||||||
log.misc.debug('on: {}, state before fullscreen: {}'.format(
|
log.misc.debug('on: {}, state before fullscreen: {}'.format(
|
||||||
on, debug.qflags_key(Qt, self.state_before_fullscreen)))
|
on, debug.qflags_key(Qt, self.state_before_fullscreen)))
|
||||||
|
|
||||||
|
@ -300,7 +300,10 @@ class FullscreenNotification(QLabel):
|
|||||||
self.setText("Page is now fullscreen.")
|
self.setText("Page is now fullscreen.")
|
||||||
|
|
||||||
self.resize(self.sizeHint())
|
self.resize(self.sizeHint())
|
||||||
geom = QApplication.desktop().screenGeometry(self)
|
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)
|
self.move((geom.width() - self.sizeHint().width()) / 2, 30)
|
||||||
|
|
||||||
def set_timeout(self, timeout):
|
def set_timeout(self, timeout):
|
||||||
|
Loading…
Reference in New Issue
Block a user