Change to webview fork

Author: geaz

CHANGELOG.md

@@ -5,14 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.5.5] - 2020-05-05
 ### Add
 - Link interception for image links
 - Option activate/deactivate logging of the host
+- New webview version
 
 ## [0.5.4] - 2020-04-29
 ### Add
 - Intercept clicks to external links and open them in the system browser
-- Patch for webview to open the webview on 'Run' instead of initialization (Windows)
 
 ### Fixed
 - GC no longer disposes the callback functions of the webview binds

CMakeLists.txt

@@ -23,27 +23,23 @@ endif()
 include(FetchContent)
 FetchContent_Declare(
     webviewNative
-    GIT_REPOSITORY https://github.com/zserge/webview.git
-    GIT_TAG 50e4bcc420abdc7be96a54b7c79934a000b76901
-    PATCH_COMMAND 
-        COMMAND git apply ${PROJECT_SOURCE_DIR}/libs/000-WindowTitlebarIcon.patch
-        COMMAND git apply ${PROJECT_SOURCE_DIR}/libs/001-InitPointVars.patch
-        COMMAND git apply ${PROJECT_SOURCE_DIR}/libs/002-Windows-HideUntilRun.patch
+    GIT_REPOSITORY https://github.com/geaz/webview
+    GIT_TAG 313eae7e61519baa1799509ca98e187bf1f28dbe
 )
 FetchContent_Populate(webviewNative)
 
 include_directories(
     "${webviewnative_SOURCE_DIR}"
-    "${webviewnative_SOURCE_DIR}/script/Microsoft.Web.WebView2.0.8.355/build/native/include"
+    "${webviewnative_SOURCE_DIR}/script/microsoft.web.webview2.0.9.488/build/native/include"
 )
-link_directories("${webviewnative_SOURCE_DIR}/script/Microsoft.Web.WebView2.0.8.355/build/native/x64")
+link_directories("${webviewnative_SOURCE_DIR}/script/microsoft.web.webview2.0.9.488/build/native/x64")
 
 add_library(webview SHARED "${webviewnative_SOURCE_DIR}/webview.cc")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     target_compile_definitions(webview PRIVATE "WEBVIEW_API=__declspec(dllexport)")
     target_link_libraries(webview WebView2Loader.dll.lib)
-    configure_file(${webviewnative_SOURCE_DIR}/script/Microsoft.Web.WebView2.0.8.355/build/x64/WebView2Loader.dll WebView2Loader.dll COPYONLY)
+    configure_file(${webviewnative_SOURCE_DIR}/script/microsoft.web.webview2.0.9.488/build/x64/WebView2Loader.dll WebView2Loader.dll COPYONLY)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     target_link_libraries(webview PkgConfig::gtk3 PkgConfig::webkit2)
 endif()

README.md

@@ -16,6 +16,8 @@ You are always able to see which webview version *sharpWebview* uses by looking
 
 All patches are also contributed back to [zserge/webview](https://github.com/zserge/webview).
 
+*REMARK:* The nuget uses this [fork](https://github.com/geaz/webview) at the moment, because the work on upstream is stalled at the moment. Because of the many patches it was not possible to maintain it without a fork.
+
 # Get started
 
 ## A basic example
@@ -33,7 +35,7 @@ Always add the *[STAThread]* attribute to the main method. This is necessary to
 static void Main(string[] args)
 ```
 
-To create a webview use a *using* block. This way you make sure that the native webview gets always disposed correctly!
+To create a webview use a *using* block. This way you make sure that the native webview gets disposed correctly!
 
 ```
 using SharpWebview;