From ea70a0dea1cd2b751cbf5bf776693f2283e67b9f Mon Sep 17 00:00:00 2001
From: Dasith Gunawardhana <dasith.gunawardhana@gmail.com>
Date: Tue, 14 Nov 2017 01:41:15 -0500
Subject: [PATCH] changed setting name and reverted non-issue fix

---
 qutebrowser/config/configdata.yml    |  6 +++---
 qutebrowser/mainwindow/mainwindow.py | 12 +++++-------
 qutebrowser/misc/miscwidgets.py      |  6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 8cf8953c3..ba8c36857 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -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
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 37d412d5e..bf95d3e6a 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -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)))
 
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 1424ceac8..f398feb4c 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -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):