2.0.0

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.0.0
+- AND/iOS/WIN/OSX: remove `webView.isSupported`, is always true
+- WIN: Updated to Windows Toolkit 5.0.0 for Modern WebView (Edge)
+- WIN: Updated to CefSharp 69.0.0
+- WIN: useHiDPI param removed from `init()`, added to `Settings.useHiDPI`
+- WIN: Added `Settings.useTransparentBackground`
+
 ### 1.9.2
 - WIN: Rendering problem on some systems Issue #185
 - WIN: Added `CefSettings.locale` Issue #185

example-desktop-as3/src/WebViewExampleAS3.as

@@ -21,7 +21,7 @@ package {
 				hasActivated = true;
 				var viewport:Rectangle = new Rectangle(0, 0, 1024, 768);
 				var settings:Settings = new Settings();
-				webview.init(stage, viewport, "https://html5test.com", settings, 1, 0xFFF1F1F1, true);
+				webview.init(stage, viewport, "https://html5test.com", settings, 1, 0xFFF1F1F1);
 				webview.visible = true;
 			}
 

example-desktop-complete/src/WebViewANESample.as

@@ -13,11 +13,13 @@ import com.tuarua.WebBtn;
 import com.tuarua.WebViewANE;
 import com.tuarua.ZoominBtn;
 import com.tuarua.ZoomoutBtn;
+import com.tuarua.utils.os;
 import com.tuarua.webview.ActionscriptCallback;
 import com.tuarua.webview.DownloadProgress;
 import com.tuarua.webview.JavascriptResult;
 import com.tuarua.webview.LogSeverity;
 import com.tuarua.webview.Settings;
+import com.tuarua.webview.WebEngine;
 import com.tuarua.webview.WebViewEvent;
 import com.tuarua.webview.popup.Behaviour;
 
@@ -106,9 +108,6 @@ public class WebViewANESample extends Sprite {
         NativeApplication.nativeApplication.activeWindow.addEventListener(
                 NativeWindowDisplayStateEvent.DISPLAY_STATE_CHANGE, onWindowMiniMaxi);
 
-        if (!webView.isSupported) return;
-
-
         webView.addCallback("js_to_as", jsToAsCallback);
         webView.addCallback("forceWebViewFocus", forceWebViewFocus); //for Windows touch - see jsTest.html
 
@@ -134,16 +133,16 @@ public class WebViewANESample extends Sprite {
         //settings.userAgent = "WebViewANE";
 
         settings.cacheEnabled = true;
-        /*
+
         // enable Edge View on Windows if available
+        /*
         settings.engine = (os.isWindows && os.majorVersion >= 10 && os.buildVersion >= 17134)
                 ? WebEngine.EDGE
-                : WebEngine.DEFAULT;
-                */
+                : WebEngine.DEFAULT;*/
 
         settings.enableDownloads = true;
         settings.contextMenu.enabled = true; //enable/disable right click
-
+        settings.useTransparentBackground = true;
 
         // See https://github.com/cefsharp/CefSharp/blob/master/CefSharp.Example/CefExample.cs#L37 for more examples
         settings.cef.commandLineArgs.push({
@@ -160,8 +159,8 @@ public class WebViewANESample extends Sprite {
 
         // trace(os.isWindows, os.majorVersion, os.minorVersion, os.buildVersion);
 
-        webView.init(stage, viewPort, "https://html5test.com", settings, 1.0, 0xFFF1F1F1, true);
-        //webView.init(WebViewANESample.target.stage, viewPort, "", settings, 1.0, 0xFFF1F1F1, true); // when using loadHTMLString
+        webView.init(stage, viewPort, "https://html5test.com", settings, 1.0, 0xFFF1F1F1);
+        //webView.init(WebViewANESample.target.stage, viewPort, "", settings, 1.0, 0xFFF1F1F1); // when using loadHTMLString
         webView.visible = true;
         webView.injectScript("function testInject(){console.log('yo yo')}");
 

example-desktop-flex/src/WebViewExampleFlex.mxml

@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<s:WindowedApplication xmlns:fx="http://ns.adobe.com/mxml/2009" 
-					   xmlns:s="library://ns.adobe.com/flex/spark" 
-					   xmlns:mx="library://ns.adobe.com/flex/mx"
-					   windowComplete="onWindowComplete()"
-					   width="1024" height="768"
-					   backgroundColor="#F1F1F1">
-	
-	<fx:Script>
+<s:WindowedApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
+                       xmlns:s="library://ns.adobe.com/flex/spark"
+                       xmlns:mx="library://ns.adobe.com/flex/mx"
+                       windowComplete="onWindowComplete()"
+                       width="1024" height="768"
+                       backgroundColor="#F1F1F1">
+
+    <fx:Script>
 		<![CDATA[
-			import com.tuarua.CommonDependencies;
-			import com.tuarua.WebViewANE;
-			import com.tuarua.webview.Settings;
-			
-			private var commonDependenciesANE:CommonDependencies = new CommonDependencies();//must create before all others
-			private var webview:WebViewANE = new WebViewANE();
-			
-			protected function onWindowComplete():void {
-				var viewport:Rectangle = getBounds(this);
-				var settings:Settings = new Settings();
-				webview.init(stage, viewport, "https://html5test.com", settings, 1, 0xFFF1F1F1, true);
-				webview.visible = true;
-			}
-		
-		]]>
+        import com.tuarua.CommonDependencies;
+        import com.tuarua.WebViewANE;
+        import com.tuarua.webview.Settings;
+
+        private var commonDependenciesANE:CommonDependencies = new CommonDependencies();//must create before all others
+        private var webview:WebViewANE = new WebViewANE();
+
+        protected function onWindowComplete():void {
+            this.stage.nativeWindow.addEventListener(NativeWindowBoundsEvent.RESIZE, onResize);
+            var viewport:Rectangle = getBounds(this);
+            var settings:Settings = new Settings();
+            webview.init(stage, viewport, "https://html5test.com", settings, 1, 0xFFF1F1F1);
+            webview.visible = true;
+        }
+
+        private function onResize(event:NativeWindowBoundsEvent):void {
+            webview.viewPort = new Rectangle(0, 0, event.afterBounds.width, event.afterBounds.height);
+        }
+        ]]>
 	</fx:Script>
-	
+
 </s:WindowedApplication>

native_extension/ane/build-windows.bat

@@ -54,9 +54,9 @@ copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELi
 copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Release\WebViewANELib.dll %pathtome%..\..\c_sharp_libs_x86\WebViewANELib.dll
 copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x64\Release\WebViewANELib.dll %pathtome%..\..\c_sharp_libs_x64\WebViewANELib.dll
 
-copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Release\Microsoft.Toolkit.Win32.UI.Controls.dll %pathtome%..\..\c_sharp_libs_x86\Microsoft.Toolkit.Win32.UI.Controls.dll
-copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x64\Release\Microsoft.Toolkit.Win32.UI.Controls.dll %pathtome%..\..\c_sharp_libs_x64\Microsoft.Toolkit.Win32.UI.Controls.dll
-copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Release\Microsoft.Toolkit.Win32.UI.Controls.dll %AIR_PATH%Microsoft.Toolkit.Win32.UI.Controls.dll
+copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Release\Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll %pathtome%..\..\c_sharp_libs_x86\Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll
+copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x64\Release\Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll %pathtome%..\..\c_sharp_libs_x64\Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll
+copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Release\Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll %AIR_PATH%Microsoft.Toolkit.Wpf.UI.Controls.WebView.dll
 
 copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Debug\FreSharpCore.dll %AIR_PATH%FreSharpCore.dll
 copy %pathtome%..\..\native_library\win\%projectName%\WebViewANELib\WebViewANELib\bin\x86\Debug\FreSharpCore.pdb %AIR_PATH%FreSharpCore.pdb

native_extension/ane/docs/com.tuarua.webview.xml

@@ -258,10 +258,10 @@
      </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>true</apiData><apiType value="Boolean"/></apiValueDef><apiDesc>
      <p>Enables browser cache.</p>
      </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:cef"><apiName>cef</apiName><shortdesc>
-	 Settings to use for CEF (Windows) version.
-	 </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiValueClassifier>com.tuarua.webview:CefSettings</apiValueClassifier></apiValueDef><apiDesc>
-	 <p>Settings to use for CEF (Windows) version.</p>
-	 </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:contextMenu"><apiName>contextMenu</apiName><shortdesc>
+     Settings to use for CEF (Windows) version.
+     </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiValueClassifier>com.tuarua.webview:CefSettings</apiValueClassifier></apiValueDef><apiDesc>
+     <p>Settings to use for CEF (Windows) version.</p>
+     </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:contextMenu"><apiName>contextMenu</apiName><shortdesc>
      Sets whether a context menu will appear on right click.</shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiValueClassifier>com.tuarua.webview:ContextMenu</apiValueClassifier></apiValueDef><apiDesc>
      <p>Sets whether a context menu will appear on right click. OSX and Windows only.</p>
      </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:downloadPath"><apiName>downloadPath</apiName><shortdesc>
@@ -280,12 +280,14 @@
      </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:urlWhiteList"><apiName>urlWhiteList</apiName><shortdesc>
      Vector of urls to allow through, example google.com - This uses a simple string match.</shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiType value="Vector$String"/></apiValueDef><apiDesc>
      <p>Vector of urls to allow through, example google.com - This uses a simple string match. There is no regex support.</p>
-     </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:userAgent"><apiName>userAgent</apiName><shortdesc>
+     </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:useHiDPI"><apiName>useHiDPI</apiName><shortdesc>
+     </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>true</apiData><apiType value="Boolean"/></apiValueDef><apiDesc></apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:useTransparentBackground"><apiName>useTransparentBackground</apiName><shortdesc>
+     Sets the container Window (HWND) of the webview to be transparent.</shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>false</apiData><apiType value="Boolean"/></apiValueDef><apiDesc></apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:userAgent"><apiName>userAgent</apiName><shortdesc>
      Value that will be returned as the User-Agent HTTP header.
      </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="String"/></apiValueDef><apiDesc>
      <p>Value that will be returned as the User-Agent HTTP header.</p>
      </apiDesc></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:Settings:webkit"><apiName>webkit</apiName><shortdesc>
-	 Settings to use for WKWebView (OSX / iOS) version.
-	 </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiValueClassifier>com.tuarua.webview:WebkitSettings</apiValueClassifier></apiValueDef><apiDesc>
-	 <p>Settings to use for WKWebView (OSX / iOS) version.</p>
-	 </apiDesc></apiValueDetail></apiValue></apiClassifier><apiClassifier id="com.tuarua.webview:ActionscriptCallback"><apiName>ActionscriptCallback</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>Object</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiConstructor id="com.tuarua.webview:ActionscriptCallback:ActionscriptCallback"><apiName>ActionscriptCallback</apiName><shortdesc/><prolog/><apiConstructorDetail><apiConstructorDef><apiAccess value="public"/><apiParam><apiItemName>args</apiItemName><apiType value="any"/><apiData>null</apiData></apiParam><apiParam><apiItemName>functionName</apiItemName><apiType value="String"/><apiData>null</apiData></apiParam><apiParam><apiItemName>callbackName</apiItemName><apiType value="String"/><apiData>null</apiData></apiParam></apiConstructorDef></apiConstructorDetail></apiConstructor><apiValue id="com.tuarua.webview:ActionscriptCallback:args"><apiName>args</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value=""/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:ActionscriptCallback:callbackName"><apiName>callbackName</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:ActionscriptCallback:functionName"><apiName>functionName</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="String"/></apiValueDef></apiValueDetail></apiValue></apiClassifier></apiPackage>
+     Settings to use for WKWebView (OSX / iOS) version.
+     </shortdesc><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiData>unknown</apiData><apiValueClassifier>com.tuarua.webview:WebkitSettings</apiValueClassifier></apiValueDef><apiDesc>
+     <p>Settings to use for WKWebView (OSX / iOS) version.</p>
+     </apiDesc></apiValueDetail></apiValue></apiClassifier><apiClassifier id="com.tuarua.webview:ActionscriptCallback"><apiName>ActionscriptCallback</apiName><shortdesc/><prolog><asMetadata/></prolog><apiClassifierDetail><apiClassifierDef><apiAccess value="public"/><apiStatic/><apiBaseClassifier>Object</apiBaseClassifier></apiClassifierDef></apiClassifierDetail><apiConstructor id="com.tuarua.webview:ActionscriptCallback:ActionscriptCallback"><apiName>ActionscriptCallback</apiName><shortdesc/><prolog/><apiConstructorDetail><apiConstructorDef><apiAccess value="public"/><apiParam><apiItemName>args</apiItemName><apiType value="any"/><apiData>null</apiData></apiParam><apiParam><apiItemName>functionName</apiItemName><apiType value="String"/><apiData>null</apiData></apiParam><apiParam><apiItemName>callbackName</apiItemName><apiType value="String"/><apiData>null</apiData></apiParam></apiConstructorDef></apiConstructorDetail></apiConstructor><apiValue id="com.tuarua.webview:ActionscriptCallback:args"><apiName>args</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value=""/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:ActionscriptCallback:callbackName"><apiName>callbackName</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="String"/></apiValueDef></apiValueDetail></apiValue><apiValue id="com.tuarua.webview:ActionscriptCallback:functionName"><apiName>functionName</apiName><shortdesc/><prolog/><apiValueDetail><apiValueDef><apiProperty/><apiAccess value="public"/><apiDynamic/><apiType value="String"/></apiValueDef></apiValueDetail></apiValue></apiClassifier></apiPackage>

native_extension/ane/docs/com.tuarua.xml

@@ -148,10 +148,7 @@
      </shortdesc><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiReturn><apiType value="void"/></apiReturn><apiParam><apiItemName>stage</apiItemName><apiType value="flash.display:Stage"/><apiDesc>    </apiDesc></apiParam><apiParam><apiItemName>viewPort</apiItemName><apiType value="flash.geom:Rectangle"/><apiDesc>    </apiDesc></apiParam><apiParam><apiItemName>initialUrl</apiItemName><apiType value="String"/><apiData>null</apiData><apiDesc>Url to load when the view loads
      </apiDesc></apiParam><apiParam><apiItemName>settings</apiItemName><apiOperationClassifier>com.tuarua.webview:Settings</apiOperationClassifier><apiData>null</apiData><apiDesc>    </apiDesc></apiParam><apiParam><apiItemName>scaleFactor</apiItemName><apiType value="Number"/><apiData>1.0</apiData><apiDesc>iOS, Android only
      </apiDesc></apiParam><apiParam><apiItemName>backgroundColor</apiItemName><apiType value="uint"/><apiData>0xFFFFFFFF</apiData><apiDesc>value of the view's background color in ARGB format.
-     </apiDesc></apiParam><apiParam><apiItemName>useHiDPI</apiItemName><apiType value="Boolean"/><apiData>false</apiData><apiDesc>set true if using <requestedDisplayResolution>high</requestedDisplayResolution> in your app xml - Windows, OSX only
-
      <p>Initialises the webView. N.B. The webView is set to visible = false initially.</p>
-
      </apiDesc></apiParam></apiOperationDef><apiDesc>
 
      </apiDesc></apiOperationDetail></apiOperation><apiOperation id="com.tuarua:WebViewANE:injectScript"><apiName>injectScript</apiName><shortdesc>
@@ -165,9 +162,6 @@
      <p><b>Ignored on Android.</b></p>
      </apiDesc></apiParam></apiOperationDef><apiDesc>
 
-     </apiDesc></apiOperationDetail></apiOperation><apiOperation id="com.tuarua:WebViewANE:isSupported"><apiName>isSupported</apiName><shortdesc>
-     </shortdesc><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiReturn><apiDesc>true if the device is Windows 7+, OSX 10.10+, Android,  or iOS 9.0+
-     </apiDesc><apiType value="Boolean"/></apiReturn></apiOperationDef><apiDesc>
      </apiDesc></apiOperationDetail></apiOperation><apiOperation id="com.tuarua:WebViewANE:loadFileURL"><apiName>loadFileURL</apiName><shortdesc>
 
      </shortdesc><prolog/><apiOperationDetail><apiOperationDef><apiAccess value="public"/><apiReturn><apiType value="void"/></apiReturn><apiParam><apiItemName>url</apiItemName><apiType value="String"/><apiDesc>full path to the file on the local file system

native_extension/ane/extension_android.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>1.9.2</versionNumber>
+    <versionNumber>2.0.0</versionNumber>
     <platforms>
         <platform name="Android-ARM">
             <applicationDeployment>

native_extension/ane/extension_ios.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>1.9.2</versionNumber>
+    <versionNumber>2.0.0</versionNumber>
     <platforms>
         <platform name="iPhone-x86">
             <applicationDeployment>

native_extension/ane/extension_multi.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>1.9.2</versionNumber>
+    <versionNumber>2.0.0</versionNumber>
     <platforms>
         <platform name="iPhone-x86">
             <applicationDeployment>

native_extension/ane/extension_osx.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>1.9.2</versionNumber>
+    <versionNumber>2.0.0</versionNumber>
     <platforms>
         <platform name="MacOS-x86-64">
             <applicationDeployment>

native_extension/ane/extension_win.xml

@@ -3,7 +3,7 @@
     <id>com.tuarua.WebViewANE</id>
     <name>WebView ANE</name>
     <copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-    <versionNumber>1.9.2</versionNumber>
+    <versionNumber>2.0.0</versionNumber>
     <platforms>
         <platform name="Windows-x86">
             <applicationDeployment>