Update CHOC-based win32 webview

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

distrho/extra/WebViewImpl.cpp

@@ -411,31 +411,31 @@ WebViewHandle webViewCreate(const char* const url,
                             const WebViewOptions& options)
 {
 #if WEB_VIEW_USING_CHOC
-    WebView* const webview = webview_choc_create(options);
+    WebView* const webview = webview_choc_create(url, options);
     if (webview == nullptr)
         return nullptr;
 
     const HWND hwnd = static_cast<HWND>(webview_choc_handle(webview));
+    ShowWindow(hwnd, SW_HIDE);
 
     LONG_PTR flags = GetWindowLongPtr(hwnd, -16);
     flags = (flags & ~WS_POPUP) | WS_CHILD;
     SetWindowLongPtr(hwnd, -16, flags);
 
     SetParent(hwnd, reinterpret_cast<HWND>(windowId));
-    SetWindowPos(hwnd, nullptr,
+    SetWindowPos(hwnd,
+                 nullptr,
                  options.offset.x,
                  options.offset.y,
-                 initialWidth - options.offset.x,
-                 initialHeight - options.offset.y,
+                 initialWidth + options.offset.x,
+                 initialHeight + options.offset.y,
                  SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
     ShowWindow(hwnd, SW_SHOW);
 
     WebViewData* const whandle = new WebViewData;
     whandle->webview = webview;
     whandle->url = url;
 
-    webview_choc_navigate(webview, url);
-
     return whandle;
 #elif WEB_VIEW_USING_MACOS_WEBKIT
     NSView* const view = reinterpret_cast<NSView*>(windowId);
@@ -835,7 +835,7 @@ void webViewResize(const WebViewHandle handle, const uint width, const uint heig
 {
    #if WEB_VIEW_USING_CHOC
     const HWND hwnd = static_cast<HWND>(webview_choc_handle(handle->webview));
-    SetWindowPos(hwnd, nullptr, 0, 0, width, height, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
+    SetWindowPos(hwnd, nullptr, 0, 0, width, height, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
    #elif WEB_VIEW_USING_MACOS_WEBKIT
     [handle->webview setFrameSize:NSMakeSize(width / scaleFactor, height / scaleFactor)];
    #elif WEB_VIEW_USING_X11_IPC

distrho/extra/WebViewWin32.hpp

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Plugin Framework (DPF)
- * Copyright (C) 2012-2025 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2026 Filipe Coelho <falktx@falktx.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any purpose with
  * or without fee is hereby granted, provided that the above copyright notice and this
@@ -35,7 +35,7 @@ using DISTRHO_NAMESPACE::WebView;
 START_NAMESPACE_DISTRHO
 #endif
 
-WebView* webview_choc_create(const WEB_VIEW_NAMESPACE::WebViewOptions& opts);
+WebView* webview_choc_create(const char* url, const WEB_VIEW_NAMESPACE::WebViewOptions& opts);
 void webview_choc_destroy(WebView*);
 void* webview_choc_handle(WebView*);
 void webview_choc_eval(WebView*, const char* js);
@@ -60,34 +60,33 @@ START_NAMESPACE_DGL
 START_NAMESPACE_DISTRHO
 #endif
 
-WebView* webview_choc_create(const WEB_VIEW_NAMESPACE::WebViewOptions& opts)
+WebView* webview_choc_create(const char* const url, const WEB_VIEW_NAMESPACE::WebViewOptions& opts)
 {
     WebView::Options wopts;
-    wopts.acceptsFirstMouseClick = true;
     wopts.enableDebugMode = true;
+    wopts.transparentBackground = true;
+    wopts.webviewIsReady = [url, opts](WebView& webview){
+        if (const WEB_VIEW_NAMESPACE::WebViewMessageCallback callback = opts.callback)
+        {
+            webview.addInitScript("function postMessage(m){window.chrome.webview.postMessage(m);}");
+            webview.bind([opts](std::string& value) {
+                opts.callback(opts.callbackPtr, value.data());
+            });
+        }
+        else
+        {
+            webview.addInitScript("function postMessage(m){}");
+        }
+
+        if (opts.initialJS != nullptr)
+            webview.addInitScript(opts.initialJS);
+
+        webview.navigate(url);
+    };
 
     std::unique_ptr<WebView> webview = std::make_unique<WebView>(wopts);
     DISTRHO_SAFE_ASSERT_RETURN(webview->loadedOK(), nullptr);
 
-    if (const WEB_VIEW_NAMESPACE::WebViewMessageCallback callback = opts.callback)
-    {
-        webview->addInitScript("function postMessage(m){window.chrome.webview.postMessage(m);}");
-
-        void* const callbackPtr = opts.callbackPtr;
-        webview->bind([callback, callbackPtr](const std::string& value) {
-            char* const data = strdup(value.data());
-            callback(callbackPtr, data);
-            std::free(data);
-        });
-    }
-    else
-    {
-        webview->addInitScript("function postMessage(m){}");
-    }
-
-    if (opts.initialJS != nullptr)
-        webview->addInitScript(opts.initialJS);
-
     return webview.release();
 }
 

distrho/extra/choc/README.md

@@ -1,11 +1,11 @@
 Taken from https://github.com/Tracktion/choc
 
 ```
-commit 2512542b2d65f3e92df7f2f1f7eeb712fa41a0de (HEAD -> main, origin/main, origin/HEAD)
-Author: Cesare Ferrari <cesare.ferrari@gmail.com>
-Date:   Sun Apr 28 12:53:17 2024 +0100
+commit ae4c54d22b53a599222c1dfaa4b4007d0ec310c7 (HEAD -> main, origin/main, origin/HEAD)
+Author: Julian Storer <julianstorer@gmail.com>
+Date:   Thu Jan 15 08:56:50 2026 +0000
 
-    Disable additional gcc warnin
+    Added a zip file creation class, ZipWriter
 ```
 
 With the big [choc.patch](./choc.patch) patch applied to top for:
@@ -16,7 +16,3 @@ With the big [choc.patch](./choc.patch) patch applied to top for:
 - remove even more stuff (json no longer needed)
 - convert choc asserts into distrho ones
 - put everything inside distrho namespace
-
-And then backported:
-
-- https://github.com/Tracktion/choc/commit/792e4bd9bedf38b9a28f12be0535c90649d5616b