@@ -94,8 +94,9 @@ EndFunc ;==>_NetWebView2_Initialize
9494; #FUNCTION# ====================================================================================================================
9595; Name ..........: _NetWebView2_CreateManager
9696; Description ...:
97- ; Syntax ........: _NetWebView2_CreateManager([$sUser_FnPrefix = ""])
98- ; Parameters ....: $sUser_FnPrefix - [optional] a string value. Default is "".
97+ ; Syntax ........: _NetWebView2_CreateManager([$sUserAgent = ''[, $sUser_FnPrefix = ""]])
98+ ; Parameters ....: $sUserAgent - [optional] a string value. Default is ''.
99+ ; $sUser_FnPrefix - [optional] a string value. Default is "".
99100; Return values .: None
100101; Author ........: mLipok, ioa747
101102; Modified ......:
@@ -104,13 +105,13 @@ EndFunc ;==>_NetWebView2_Initialize
104105; Link ..........:
105106; Example .......: No
106107; ===============================================================================================================================
107- Func _NetWebView2_CreateManager($sUser_FnPrefix = " " )
108+ Func _NetWebView2_CreateManager($sUserAgent = ' ' , $ sUser_FnPrefix = " " )
108109 Local $oMyError = ObjEvent (" AutoIt.Error" , __NetWebView2_COMErrFunc) ; Local COM Error Handler
109110 #forceref $oMyError
110111 Local $oWebV2M = ObjCreate (" NetWebView2.Manager" ) ; REGISTERED VERSION
111112; ~ __NetWebView2_ObjName_FlagsValue($oWebV2M)
112113 If @error Then __NetWebView2_Log(@ScriptLineNumber , " ! [NetWebView2Lib]: Manager Creation ERROR" , 1 )
113-
114+ If $sUserAgent Then $oWebV2M .SetUserAgent( $sUserAgent )
114115 If $sUser_FnPrefix Then $_g_sNetWebView2_User_WebViewEvents = $sUser_FnPrefix
115116 ObjEvent ($oWebV2M , " __NetWebView2_WebViewEvents__" , " IWebViewEvents" )
116117 Return SetError (@error , @extended , $oWebV2M )
@@ -241,7 +242,7 @@ Func _NetWebView2_LoadWait(ByRef $oWebV2M, $iStatus = $WEBVIEW2__NAVSTATUS__READ
241242 EndIf
242243; ~ If @error Then Return SetError(@error, @extended, -1)
243244 WEnd
244- If $_g_bNetWebView2_DebugInfo Then ConsoleWrite (" ! After _NetWebView2_LoadWait(" & $iStatus & " ) ::: _NetWebView2_NavigationStatus()=" & _NetWebView2_NavigationStatus() & @CRLF )
245+ If $_g_bNetWebView2_DebugInfo Then ConsoleWrite (" ! After _NetWebView2_LoadWait(" & $iStatus & " ) ::: _NetWebView2_NavigationStatus()=" & _NetWebView2_NavigationStatus() & @CRLF )
245246 _NetWebView2_NavigationStatus($WEBVIEW2__NAVSTATUS__READY )
246247
247248EndFunc ; ==>_NetWebView2_LoadWait
@@ -272,6 +273,15 @@ Func _NetWebView2_Navigate(ByRef $oWebV2M, $sURL, $b_LoadWait = True)
272273 Return SetError (@error , @extended , ' ' )
273274EndFunc ; ==>_NetWebView2_Navigate
274275
276+ Func _NetWebView2_GetSource(ByRef $oWebV2M )
277+ Local $oMyError = ObjEvent (" AutoIt.Error" , __NetWebView2_COMErrFunc) ; Local COM Error Handler
278+ #forceref $oMyError
279+
280+ Local $sSource = $oWebV2M .GetSource()
281+ Return SetError (@error , @extended , $sSource )
282+ EndFunc ; ==>_NetWebView2_GetSource
283+
284+
275285; #FUNCTION# ====================================================================================================================
276286; Name ..........: _NetWebView2_NavigateToString
277287; Description ...:
@@ -535,11 +545,51 @@ Func __NetWebView2_JSEvents__OnMessageReceived($sMsg)
535545
536546EndFunc ; ==>__NetWebView2_JSEvents__OnMessageReceived
537547
548+ Func __NetWebView2_WebViewEvents__OnBrowserGotFocus($iReason )
549+ Local $s_Prefix = " [WebViewEvents__OnBrowserGotFocus]:"
550+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " REASON: " & $iReason , 1 )
551+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnBrowserGotFocus
552+
553+ Func __NetWebView2_WebViewEvents__OnBrowserLostFocus($iReason )
554+ Local $s_Prefix = " [WebViewEvents__OnBrowserLostFocus]:"
555+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " REASON: " & $iReason , 1 )
556+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnBrowserLostFocus
557+
558+ Func __NetWebView2_WebViewEvents__OnZoomChanged($iFactor )
559+ Local $s_Prefix = " [WebViewEvents__OnZoomChanged]:"
560+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " FACTOR: " & $iFactor , 1 )
561+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnZoomChanged
562+
563+ Func __NetWebView2_WebViewEvents__OnURLChanged($sNewUrl )
564+ Local $s_Prefix = " [WebViewEvents__OnURLChanged]:"
565+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " NewURL: " & $sNewUrl , 1 )
566+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnURLChanged
567+
568+ Func __NetWebView2_WebViewEvents__OnTitleChanged($sNewTitle )
569+ Local $s_Prefix = " [WebViewEvents__OnTitleChanged]:"
570+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " NewTitle: " & $sNewTitle , 1 )
571+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnTitleChanged
572+
573+ Func __NetWebView2_WebViewEvents__OnNavigationStarting($sNewUrl )
574+ Local $s_Prefix = " [WebViewEvents__OnNavigationStarting]:"
575+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " NewURL: " & $sNewUrl , 1 )
576+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnNavigationCompleted
577+
578+ Func __NetWebView2_WebViewEvents__OnNavigationCompleted($bIsSuccess , $iWebErrorStatus )
579+ Local $s_Prefix = " [WebViewEvents__OnNavigationCompleted]:"
580+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " IsSuccess: " & $bIsSuccess & " WebErrorStatus: " & $iWebErrorStatus , 1 )
581+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnNavigationCompleted
582+
538583#TODO = > Func __NetWebView2_WebViewEvents__OnContextMenuRequested(ByRef $oWebV2M , $sLink , $iX , $iY , $sSelection )
539584Func __NetWebView2_WebViewEvents__OnContextMenuRequested($sLink , $iX , $iY , $sSelection )
540585 #forceref $sLink, $iX, $iY, $sSelection
541586 Local $oMyError = ObjEvent (" AutoIt.Error" , __NetWebView2_COMErrFunc) ; Local COM Error Handler
542587 #forceref $oMyError
543588EndFunc ; ==>__NetWebView2_WebViewEvents__OnContextMenuRequested
589+
590+ Func __NetWebView2_WebViewEvents__OnContextMenu($sMenuData )
591+ Local $s_Prefix = " [WebViewEvents__OnContextMenu]:"
592+ __NetWebView2_Log(@ScriptLineNumber , $s_Prefix & " MenuData: " & $sMenuData , 1 )
593+ EndFunc ; ==>__NetWebView2_WebViewEvents__OnContextMenu
544594#EndRegion ; NetWebView2Lib UDF - === EVENT HANDLERS ===
545595
0 commit comments