Commit 788248a9 authored by Simon Chae's avatar Simon Chae
Browse files

Issue #3666: Set desktopMode toggle against settings.useWideViewPort

For toggleDesktopMode()
parent aa6fbf0d
...@@ -49,7 +49,7 @@ class SystemEngineSession( ...@@ -49,7 +49,7 @@ class SystemEngineSession(
@Volatile internal var trackingProtectionPolicy: TrackingProtectionPolicy? = null @Volatile internal var trackingProtectionPolicy: TrackingProtectionPolicy? = null
@Volatile internal var webFontsEnabled = true @Volatile internal var webFontsEnabled = true
@Volatile internal var currentUrl = "" @Volatile internal var currentUrl = ""
@Volatile internal var useWideViewPort: Boolean? = null @Volatile internal var useWideViewPort: Boolean? = null // See [toggleDesktopMode]
@Volatile internal var fullScreenCallback: WebChromeClient.CustomViewCallback? = null @Volatile internal var fullScreenCallback: WebChromeClient.CustomViewCallback? = null
// This is public for FFTV which needs access to the WebView instance. We can mark it internal once // This is public for FFTV which needs access to the WebView instance. We can mark it internal once
...@@ -348,11 +348,15 @@ class SystemEngineSession( ...@@ -348,11 +348,15 @@ class SystemEngineSession(
/** /**
* See [EngineSession.toggleDesktopMode] * See [EngineSession.toggleDesktopMode]
*
* Precondition:
* If settings.useWideViewPort = true, then webSettings.useWideViewPort is always on
* If settings.useWideViewPort = false or null, then webSettings.useWideViewPort can be on/off
*/ */
override fun toggleDesktopMode(enable: Boolean, reload: Boolean) { override fun toggleDesktopMode(enable: Boolean, reload: Boolean) {
val webSettings = webView.settings val webSettings = webView.settings
webSettings.userAgentString = toggleDesktopUA(webSettings.userAgentString, enable) webSettings.userAgentString = toggleDesktopUA(webSettings.userAgentString, enable)
webSettings.useWideViewPort = settings.useWideViewPort ?: enable webSettings.useWideViewPort = if (settings.useWideViewPort == true) true else enable
notifyObservers { onDesktopModeChange(enable) } notifyObservers { onDesktopModeChange(enable) }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment