Merge remote-tracking branch 'origin/pr/3285'

This commit is contained in:
Florian Bruhin 2017-11-15 07:32:04 +01:00
commit ea71f0e318
3 changed files with 16 additions and 6 deletions

View File

@ -259,6 +259,12 @@ content.default_encoding:
The encoding must be a string describing an encoding such as _utf-8_,
_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:
type: Bool
default: false

View File

@ -491,6 +491,7 @@ class MainWindow(QWidget):
@pyqtSlot(bool)
def _on_fullscreen_requested(self, on):
if not config.val.content.windowed_fullscreen:
if on:
self.state_before_fullscreen = self.windowState()
self.showFullScreen()

View File

@ -300,6 +300,9 @@ class FullscreenNotification(QLabel):
self.setText("Page is now fullscreen.")
self.resize(self.sizeHint())
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)