Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserView.py	Mon May 15 18:36:49 2017 +0200
+++ b/WebBrowser/WebBrowserView.py	Tue May 16 18:41:29 2017 +0200
@@ -1288,8 +1288,8 @@
         if self.__mw and self.__mw.isFullScreen():
             if self.__mw.isFullScreenNavigationVisible():
                 self.__mw.hideFullScreenNavigation()
-            elif evt.y() < 5:
-                # mouse is within 5px to the top
+            elif evt.y() < 10:
+                # mouse is within 10px to the top
                 self.__mw.showFullScreenNavigation()
         
         if WebBrowserWindow.autoScroller().mouseMove(evt):

--- a/WebBrowser/WebBrowserWindow.py	Mon May 15 18:36:49 2017 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Tue May 16 18:41:29 2017 +0200
@@ -168,7 +168,7 @@
             self.networkManager()
             
             self.__htmlFullScreen = False
-            self.__windowStates = 0
+            self.__windowStates = Qt.WindowNoState
             
             from .SearchWidget import SearchWidget
             from .QtHelp.HelpTocWidget import HelpTocWidget
@@ -1271,8 +1271,13 @@
             self.tr('Full Screen'),
             UI.PixmapCache.getIcon("windowFullscreen.png"),
             self.tr('&Full Screen'),
-            QKeySequence(self.tr('F11')), 0,
+            0, 0,
             self, 'webbrowser_view_full_screen')
+        if Globals.isMacPlatform():
+            self.fullScreenAct.setShortcut(
+                QKeySequence(self.tr("Meta+Ctrl+F")))
+        else:
+            self.fullScreenAct.setShortcut(QKeySequence(self.tr('F11')))
         if not self.__initShortcutsOnly:
             self.fullScreenAct.triggered.connect(self.toggleFullScreen)
         self.__actions.append(self.fullScreenAct)