support dialogs in macos webview

Signed-off-by: falkTX <[email protected]>
mod-audio · May 4, 2024 · 62a37f3 · 62a37f3
1 parent 93dffb5
commit 62a37f3
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 107 deletions.
diff --git a/src/CHOC b/src/CHOC
diff --git a/src/DPF b/src/DPF
diff --git a/src/PawPaw b/src/PawPaw
diff --git a/src/plugin/Makefile b/src/plugin/Makefile
@@ -24,9 +24,9 @@ FILES_DSP = \
 FILES_UI = DesktopUI.cpp NanoButton.cpp utils.cpp
 
 ifeq ($(MACOS),true)
-FILES_UI += WebView.mm
+FILES_UI += WebViewWK.mm
 else ifeq ($(WINDOWS),true)
-FILES_UI += WebViewWin32.cpp
+FILES_UI += WebViewCHOC.cpp
 else
 FILES_UI += WebViewX11.cpp
 endif
@@ -40,29 +40,31 @@ USING_WEBVIEW = true
 
 include ../DPF/Makefile.plugins.mk
 
-BUILD_CXX_FLAGS += -DVERSION='"$(shell cat ../../VERSION)"'
+TARGETS = features au clap lv2_sep vst2 vst3
 
+BUILD_CXX_FLAGS += -DVERSION='"$(shell cat ../../VERSION)"'
 BUILD_CXX_FLAGS += -pthread
-LINK_FLAGS += -pthread
 
 ifeq ($(MACOS),true)
-LINK_FLAGS += -framework CoreFoundation -framework IOKit -framework WebKit
 else ifeq ($(WINDOWS),true)
-LINK_FLAGS += -lwinmm
-else ifeq ($(LINUX),true)
+BUILD_CXX_FLAGS += -I../CHOC
+else
 BUILD_CXX_FLAGS += $(shell $(PKG_CONFIG) --cflags Qt5Core)
 # -std=gnu++14
-LINK_FLAGS += -ldl -lrt
 endif
 
-TARGETS = features au clap lv2_sep vst2 vst3
+LINK_FLAGS += -pthread
 
-ifeq ($(WINDOWS),true)
-BUILD_CXX_FLAGS += -I../CHOC
-LINK_FLAGS += -lole32
-$(BUILD_DIR)/WebViewWin32.cpp.o: BUILD_CXX_FLAGS += -std=gnu++17
+ifeq ($(MACOS),true)
+LINK_FLAGS += -framework CoreFoundation -framework IOKit -framework WebKit
+else ifeq ($(WINDOWS),true)
+LINK_FLAGS += -lole32 -lwinmm
+else
+LINK_FLAGS += -ldl -lrt
 endif
 
+$(BUILD_DIR)/WebViewCHOC.cpp.o: BUILD_CXX_FLAGS += -std=gnu++17
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 all: $(TARGETS)
diff --git a/src/plugin/WebView.mm b/src/plugin/WebView.mm
diff --git a/src/plugin/WebViewWin32.cpp → src/plugin/WebViewCHOC.cpp b/src/plugin/WebViewWin32.cpp → src/plugin/WebViewCHOC.cpp
@@ -7,33 +7,50 @@
 #define WC_ERR_INVALID_CHARS 0
 #include "gui/choc_WebView.h"
 
+#ifdef __APPLE__
+# import <Cocoa/Cocoa.h>
+#endif
+
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------------------------------------------
 
 void* addWebView(const uintptr_t parentWinId, const double scaleFactor, const uint port)
 {
-    std::unique_ptr<choc::ui::WebView> webview = std::make_unique<choc::ui::WebView>(choc::ui::WebView());
+    std::unique_ptr<choc::ui::WebView> webview = std::make_unique<choc::ui::WebView>();
     DISTRHO_SAFE_ASSERT_RETURN(webview->loadedOK(), nullptr);
 
-    const HWND handle = static_cast<HWND>(webview->getViewHandle());
+    void* const handle = webview->getViewHandle();
     DISTRHO_SAFE_ASSERT_RETURN(handle != nullptr, nullptr);
 
     char url[32] = {};
     std::snprintf(url, 31, "http://127.0.0.1:%u/", port);
     webview->navigate(url);
 
-    LONG_PTR flags = GetWindowLongPtr(handle, -16);
+   #if defined(__APPLE__)
+    NSView* const view = static_cast<NSView*>(handle);
+
+    [reinterpret_cast<NSView*>(parentWinId) addSubview:view];
+    [view setFrame:NSMakeRect(0,
+                              kVerticalOffset,
+                              DISTRHO_UI_DEFAULT_WIDTH,
+                              DISTRHO_UI_DEFAULT_HEIGHT - kVerticalOffset)];
+   #elif defined(_WIN32)
+    const HWND hwnd = static_cast<HWND>(handle);
+
+    LONG_PTR flags = GetWindowLongPtr(hwnd, -16);
     flags = (flags & ~WS_POPUP) | WS_CHILD;
-    SetWindowLongPtr(handle, -16, flags);
+    SetWindowLongPtr(hwnd, -16, flags);
 
-    SetParent(handle, reinterpret_cast<HWND>(parentWinId));
-    SetWindowPos(handle, nullptr,
-                 0, kVerticalOffset * scaleFactor,
+    SetParent(hwnd, reinterpret_cast<HWND>(parentWinId));
+    SetWindowPos(hwnd, nullptr,
+                 0,
+                 kVerticalOffset * scaleFactor,
                  DISTRHO_UI_DEFAULT_WIDTH * scaleFactor,
                  (DISTRHO_UI_DEFAULT_HEIGHT - kVerticalOffset) * scaleFactor,
                  SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
-    ShowWindow(handle, SW_SHOW);
+    ShowWindow(hwnd, SW_SHOW);
+   #endif
 
     return webview.release();
 }
@@ -56,8 +73,13 @@ void resizeWebView(void* const webviewptr, const uint offset, const uint width,
 {
     choc::ui::WebView* const webview = static_cast<choc::ui::WebView*>(webviewptr);
 
-    const HWND handle = static_cast<HWND>(webview->getViewHandle());
-    SetWindowPos(handle, nullptr, 0, offset, width, height, SWP_NOZORDER | SWP_NOACTIVATE);
+   #if defined(__APPLE__)
+    NSView* const view = static_cast<NSView*>(webview->getViewHandle());
+    [view setFrame:NSMakeRect(0, offset, width, height)];
+   #elif defined(_WIN32)
+    const HWND hwnd = static_cast<HWND>(webview->getViewHandle());
+    SetWindowPos(hwnd, nullptr, 0, offset, width, height, SWP_NOZORDER | SWP_NOACTIVATE);
+   #endif
 }
 
 // -----------------------------------------------------------------------------------------------------------
+3 −1		README.md
+3 −3		audio/choc_AudioFileFormat_WAV.h
+2 −2		audio/choc_AudioMIDIBlockDispatcher.h
+11 −9		containers/choc_Value.h
+390 −0		containers/choc_ZipFile.h
+4,006 −0		containers/choc_zlib.h
+45 −24		gui/choc_DesktopWindow.h
+59 −9		gui/choc_MessageLoop.h
+380 −52		gui/choc_WebView.h
+41 −14		javascript/choc_javascript.h
+1 −1		javascript/choc_javascript_Console.h
+17 −1		javascript/choc_javascript_Duktape.h
+268 −250		javascript/choc_javascript_QuickJS.h
+1 −1		javascript/choc_javascript_Timer.h
+42 −6		javascript/choc_javascript_V8.h
+9 −8		memory/choc_ObjectPointer.h
+7 −3		memory/choc_ObjectReference.h
+21 −0		platform/choc_DisableAllWarnings.h
+444 −95		tests/choc_tests.h
+1 −1		tests/main.cpp
+ −		tests/test.zip
+90 −3		text/choc_Files.h
+4 −4		text/choc_JSON.h
+97 −0		text/choc_MIMETypes.h