diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /examples/webengine/quicknanobrowser/BrowserWindow.qml | |
parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'examples/webengine/quicknanobrowser/BrowserWindow.qml')
-rw-r--r-- | examples/webengine/quicknanobrowser/BrowserWindow.qml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml index e8a9cb9ce..ed49040ca 100644 --- a/examples/webengine/quicknanobrowser/BrowserWindow.qml +++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml @@ -54,18 +54,6 @@ ApplicationWindow { property Item currentWebView: tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null property int previousVisibility: Window.Windowed - property bool isFullScreen: visibility == Window.FullScreen - onIsFullScreenChanged: { - // This is for the case where the system forces us to leave fullscreen. - if (currentWebView && !isFullScreen) { - currentWebView.state = "" - if (currentWebView.isFullScreen) { - currentWebView.fullScreenCancelled() - fullScreenNotification.hide() - } - } - } - width: 1300 height: 900 visible: true @@ -127,8 +115,11 @@ ApplicationWindow { Action { shortcut: "Escape" onTriggered: { - if (browserWindow.isFullScreen) + if (currentWebView.state == "FullScreen") { browserWindow.visibility = browserWindow.previousVisibility + fullScreenNotification.hide() + currentWebView.triggerWebAction(WebEngineView.ExitFullScreen); + } } } Action { @@ -271,7 +262,7 @@ ApplicationWindow { id: pluginsEnabled text: "Plugins On" checkable: true - checked: WebEngine.settings.pluginsEnabled + checked: true } MenuItem { id: fullScreenSupportEnabled |