plusui-native-core 0.1.105 → 0.1.107

package/Core/Features/Window/window.cpp

@@ -1,22 +1,25 @@
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <map>
-#include <plusui/display.hpp>
-#include <plusui/tray.hpp>
-#include <plusui/webgpu.hpp>
-#include <plusui/window.hpp>
-#include <regex>
-#include <sstream>
-
-#ifdef _WIN32
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#include <WebView2.h>
-#include <windows.h>
-#include <wrl.h>
-using namespace Microsoft::WRL;
-#pragma warning(pop)
+#include <fstream>
+#include <functional>
+#include <iostream>
+#include <map>
+#include <plusui/display.hpp>
+#include <plusui/tray.hpp>
+#include <plusui/webgpu.hpp>
+#include <plusui/window.hpp>
+#include <regex>
+#include <sstream>
+
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#include <WebView2.h>
+#include <windows.h>
+#include <wrl.h>
+#include <shlobj.h>
+#include <oleidl.h>
+#include <shellapi.h>
+using namespace Microsoft::WRL;
+#pragma warning(pop)
 #elif defined(__APPLE__)
 #include <Cocoa/Cocoa.h>
 #import <AppKit/AppKit.h>
@@ -25,66 +28,67 @@ using namespace Microsoft::WRL;
 #include <objc/objc-runtime.h>
 
 #else
+#include <cstdlib>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 #endif
-
-#include <stb_image.h>
-
-namespace plusui {
-
-namespace {
-constexpr char kHideScrollbarsScript[] = R"(
-  (function() {
-    var css = "::-webkit-scrollbar{display:none!important;width:0!important;height:0!important;}::-webkit-scrollbar-track{background:transparent!important;}::-webkit-scrollbar-thumb{background:transparent!important;}*{-ms-overflow-style:none!important;scrollbar-width:none!important;scrollbar-color:transparent transparent!important;}";
-    var styleId = "__plusui_hide_scrollbars";
-    var ensureStyle = function() {
-      if (document.getElementById(styleId)) return;
-      var style = document.createElement("style");
-      style.id = styleId;
-      style.type = "text/css";
-      style.appendChild(document.createTextNode(css));
-      var container = document.head || document.documentElement || document.body;
-      if (container) {
-        container.appendChild(style);
-      }
-    };
-    ensureStyle();
-    document.addEventListener("DOMContentLoaded", ensureStyle);
-    window.addEventListener("load", ensureStyle);
-  })();
-)";
-
-#ifdef _WIN32
-static std::string jsonEscape(const std::string &input) {
-  std::string out;
-  out.reserve(input.size() + 8);
-  for (char c : input) {
-    switch (c) {
-    case '\\':
-      out += "\\\\";
-      break;
-    case '"':
-      out += "\\\"";
-      break;
-    case '\n':
-      out += "\\n";
-      break;
-    case '\r':
-      out += "\\r";
-      break;
-    case '\t':
-      out += "\\t";
-      break;
-    default:
-      out += c;
-      break;
-    }
-  }
-  return out;
-}
-
+
+#include <stb_image.h>
+
+namespace plusui {
+
+namespace {
+constexpr char kHideScrollbarsScript[] = R"(
+  (function() {
+    var css = "::-webkit-scrollbar{display:none!important;width:0!important;height:0!important;}::-webkit-scrollbar-track{background:transparent!important;}::-webkit-scrollbar-thumb{background:transparent!important;}*{-ms-overflow-style:none!important;scrollbar-width:none!important;scrollbar-color:transparent transparent!important;}";
+    var styleId = "__plusui_hide_scrollbars";
+    var ensureStyle = function() {
+      if (document.getElementById(styleId)) return;
+      var style = document.createElement("style");
+      style.id = styleId;
+      style.type = "text/css";
+      style.appendChild(document.createTextNode(css));
+      var container = document.head || document.documentElement || document.body;
+      if (container) {
+        container.appendChild(style);
+      }
+    };
+    ensureStyle();
+    document.addEventListener("DOMContentLoaded", ensureStyle);
+    window.addEventListener("load", ensureStyle);
+  })();
+)";
+
+#ifdef _WIN32
+static std::string jsonEscape(const std::string &input) {
+  std::string out;
+  out.reserve(input.size() + 8);
+  for (char c : input) {
+    switch (c) {
+    case '\\':
+      out += "\\\\";
+      break;
+    case '"':
+      out += "\\\"";
+      break;
+    case '\n':
+      out += "\\n";
+      break;
+    case '\r':
+      out += "\\r";
+      break;
+    case '\t':
+      out += "\\t";
+      break;
+    default:
+      out += c;
+      break;
+    }
+  }
+  return out;
+}
+
 // Map Windows VK code to PlusUI KeyCode (GLFW-style values)
 static int vkToPlusUIKeyCode(WPARAM vk) {
   if (vk >= 'A' && vk <= 'Z') return (int)vk;           // A=65…Z=90
@@ -121,31 +125,41 @@ static int currentKeyMods() {
   return mods;
 }
 
-static std::string mimeTypeFromPath(const std::string &path) {
-  size_t dot = path.find_last_of('.');
-  if (dot == std::string::npos)
-    return "application/octet-stream";
-  std::string ext = path.substr(dot);
-  for (char &ch : ext)
-    ch = static_cast<char>(tolower(static_cast<unsigned char>(ch)));
-  if (ext == ".png")
-    return "image/png";
-  if (ext == ".jpg" || ext == ".jpeg")
-    return "image/jpeg";
-  if (ext == ".gif")
-    return "image/gif";
-  if (ext == ".webp")
-    return "image/webp";
-  if (ext == ".svg")
-    return "image/svg+xml";
-  if (ext == ".txt")
-    return "text/plain";
-  if (ext == ".json")
-    return "application/json";
-  if (ext == ".pdf")
-    return "application/pdf";
+static std::string mimeTypeFromPath(const std::string &path) {
+  size_t dot = path.find_last_of('.');
+  if (dot == std::string::npos)
+    return "application/octet-stream";
+  std::string ext = path.substr(dot);
+  for (char &ch : ext)
+    ch = static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+  if (ext == ".png")
+    return "image/png";
+  if (ext == ".jpg" || ext == ".jpeg")
+    return "image/jpeg";
+  if (ext == ".gif")
+    return "image/gif";
+  if (ext == ".webp")
+    return "image/webp";
+  if (ext == ".svg")
+    return "image/svg+xml";
+  if (ext == ".txt")
+    return "text/plain";
+  if (ext == ".json")
+    return "application/json";
+  if (ext == ".pdf")
+    return "application/pdf";
   return "application/octet-stream";
 }
+// ---------------------------------------------------------------------------
+//
+// WebView2 has a design problem: AllowExternalDrop(TRUE) makes it consume
+// drops so WM_DROPFILES never fires; AllowExternalDrop(FALSE) makes it
+// reject drags entirely so even WM_DROPFILES never fires.  The solution is
+// to keep AllowExternalDrop(FALSE) and register our own IDropTarget on the
+// parent HWND via RegisterDragDrop.  This intercepts drops before WebView2
+// ever sees them, giving us full control over visual feedback AND file data.
+// ---------------------------------------------------------------------------
+
 #endif // _WIN32
 
 #if !defined(_WIN32)
@@ -181,200 +195,85 @@ static std::string buildShortcutScript(const std::string& id) {
 #endif // !_WIN32
 
 } // namespace
-
-struct Window::Impl {
-  void *nativeWindow = nullptr;
-  void *nativeWebView = nullptr;
-  WindowConfig config;
-  WindowState state;
-
-  // WebView-specific members
-  std::string currentURL;
-  std::string currentTitle;
-  std::shared_ptr<Window> window;
-  std::string userAgent;
-  bool loading = false;
-  double zoom = 1.0;
-  bool ready = false;
-  std::vector<std::string> pendingScripts;
-  std::string pendingNavigation;
-  std::string pendingHTML;
-  std::string pendingFile;
-  std::unique_ptr<TrayManager> trayManager;
-  WebGPU webgpu;
-  NavigationCallback navigationCallback;
-  LoadCallback loadStartCallback;
-  LoadCallback loadEndCallback;
-  LoadCallback navigationCompleteCallback;
-  ErrorCallback errorCallback;
-  ConsoleCallback consoleCallback;
-  MessageCallback messageCallback;
+
+struct Window::Impl {
+  void *nativeWindow = nullptr;
+  void *nativeWebView = nullptr;
+  WindowConfig config;
+  WindowState state;
+
+  // WebView-specific members
+  std::string currentURL;
+  std::string currentTitle;
+  std::shared_ptr<Window> window;
+  std::string userAgent;
+  bool loading = false;
+  double zoom = 1.0;
+  bool ready = false;
+  std::vector<std::string> pendingScripts;
+  std::string pendingNavigation;
+  std::string pendingHTML;
+  std::string pendingFile;
+  std::unique_ptr<TrayManager> trayManager;
+  WebGPU webgpu;
+  NavigationCallback navigationCallback;
+  LoadCallback loadStartCallback;
+  LoadCallback loadEndCallback;
+  LoadCallback navigationCompleteCallback;
+  ErrorCallback errorCallback;
+  ConsoleCallback consoleCallback;
+  MessageCallback messageCallback;
   FileDropCallback fileDropCallback;
   std::map<std::string, JSCallback> bindings;
   std::map<int, std::string> hotkeys; // hotkey id -> shortcut id
-
-  std::vector<MoveCallback> moveCallbacks;
-  std::vector<ResizeCallback> resizeCallbacks;
-  std::vector<CloseCallback> closeCallbacks;
-  std::vector<FocusCallback> focusCallbacks;
-  std::vector<StateCallback> stateCallbacks;
-
-#ifdef _WIN32
-  HWND hwnd = nullptr;
-  WNDPROC originalProc = nullptr;
-  ComPtr<ICoreWebView2Controller> controller;
-  ComPtr<ICoreWebView2> webview;
-  static std::map<HWND, Impl *> embeddedWebviewByParent;
-
-  static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
-    Impl *impl = nullptr;
-    if (msg == WM_NCCREATE) {
-      auto cs = (LPCREATESTRUCT)lp;
-      impl = (Impl *)cs->lpCreateParams;
-      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)impl);
-    } else {
-      impl = (Impl *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-    }
-
-    if (impl) {
-      switch (msg) {
-      case WM_MOVE: {
-        int x = (int)(short)LOWORD(lp);
-        int y = (int)(short)HIWORD(lp);
-        impl->state.x = x;
-        impl->state.y = y;
-        for (auto &cb : impl->moveCallbacks)
-          cb(x, y);
-        break;
-      }
-      case WM_SIZE: {
-        int width = LOWORD(lp);
-        int height = HIWORD(lp);
-        impl->state.width = width;
-        impl->state.height = height;
-        for (auto &cb : impl->resizeCallbacks)
-          cb(width, height);
-        break;
-      }
-      case WM_CLOSE:
-        for (auto &cb : impl->closeCallbacks)
-          cb();
-        break;
-      case WM_DROPFILES: {
-        HDROP hDrop = reinterpret_cast<HDROP>(wp);
-        Impl *targetImpl = impl;
-        if (!targetImpl->webview) {
-          auto it = embeddedWebviewByParent.find(hwnd);
-          if (it != embeddedWebviewByParent.end()) {
-            targetImpl = it->second;
-          }
-        }
-
-        if (!targetImpl || !targetImpl->config.fileDrop ||
-            !targetImpl->webview) {
-          DragFinish(hDrop);
-          return 0;
-        }
-
-        UINT fileCount = DragQueryFileW(hDrop, 0xFFFFFFFF, nullptr, 0);
-        std::string filesJson = "[";
-
-        for (UINT i = 0; i < fileCount; ++i) {
-          UINT pathLen = DragQueryFileW(hDrop, i, nullptr, 0);
-          std::wstring wpath(pathLen + 1, L'\0');
-          DragQueryFileW(hDrop, i, &wpath[0], pathLen + 1);
-          wpath.resize(pathLen);
-
-          int utf8Len = WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1,
-                                            nullptr, 0, nullptr, nullptr);
-          std::string path;
-          if (utf8Len > 0) {
-            path.resize(static_cast<size_t>(utf8Len - 1));
-            WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, &path[0],
-                                utf8Len, nullptr, nullptr);
-          }
-
-          std::string name = path;
-          size_t lastSlash = path.find_last_of("\\/");
-          if (lastSlash != std::string::npos) {
-            name = path.substr(lastSlash + 1);
-          }
-
-          unsigned long long sizeBytes = 0;
-          WIN32_FILE_ATTRIBUTE_DATA fileAttr;
-          if (GetFileAttributesExW(wpath.c_str(), GetFileExInfoStandard,
-                                   &fileAttr)) {
-            ULARGE_INTEGER size;
-            size.HighPart = fileAttr.nFileSizeHigh;
-            size.LowPart = fileAttr.nFileSizeLow;
-            sizeBytes = size.QuadPart;
-          }
-
-          if (i > 0)
-            filesJson += ",";
-          filesJson += "{\"path\":\"" + jsonEscape(path) + "\",\"name\":\"" +
-                       jsonEscape(name) + "\",\"type\":\"" +
-                       jsonEscape(mimeTypeFromPath(path)) +
-                       "\",\"size\":" + std::to_string(sizeBytes) + "}";
-        }
-        filesJson += "]";
-
-        // Must query drop point BEFORE DragFinish invalidates hDrop
-        POINT dropPoint = {0, 0};
-        DragQueryPoint(hDrop, &dropPoint);
-
-        DragFinish(hDrop);
-
-        // Always fire the C++ callback regardless of zone
-        if (targetImpl->fileDropCallback) {
-          targetImpl->fileDropCallback(filesJson);
-        }
 
-        // DragQueryPoint returns physical (device) pixels relative to the
-        // client area.  document.elementFromPoint uses CSS (logical) pixels.
-        // Divide by the DPI scale factor so the hit-test is correct on HiDPI
-        // displays (e.g. 150% scaling → divide by 1.5).
-        double dpiScale = 1.0;
-        UINT dpi = GetDpiForWindow(hwnd);
-        if (dpi > 0) dpiScale = static_cast<double>(dpi) / 96.0;
+  std::vector<MoveCallback> moveCallbacks;
+  std::vector<ResizeCallback> resizeCallbacks;
+  std::vector<CloseCallback> closeCallbacks;
+  std::vector<FocusCallback> focusCallbacks;
+  std::vector<StateCallback> stateCallbacks;
 
-        int dpx = static_cast<int>(dropPoint.x / dpiScale);
-        int dpy = static_cast<int>(dropPoint.y / dpiScale);
+#ifdef _WIN32
+  HWND hwnd = nullptr;
+  WNDPROC originalProc = nullptr;
+  ComPtr<ICoreWebView2Controller> controller;
+  ComPtr<ICoreWebView2> webview;
+  static std::map<HWND, Impl *> embeddedWebviewByParent;
 
-        std::string eventScript =
-            "(function(){"
-            "var files=" +
-            filesJson +
-            ";"
-            // Clear any leftover visual feedback from the drag
-            "document.querySelectorAll('.dropzone-active,.filedrop-active')"
-            ".forEach(function(z){z.classList.remove('dropzone-active');"
-            "z.classList.remove('filedrop-active');});"
-            // Global event — always fires
-            "window.dispatchEvent(new "
-            "CustomEvent('plusui:fileDrop.filesDropped',"
-            " { detail: { files: files } }));"
-            // Zone-specific delivery via DPI-corrected hit test
-            "var el=document.elementFromPoint(" +
-            std::to_string(dpx) + "," + std::to_string(dpy) +
-            ");"
-            "var zone=el&&el.closest?el.closest('[data-dropzone]'):null;"
-            "var zoneName=zone?zone.getAttribute('data-dropzone'):null;"
-            "if(zoneName&&window.__plusui_fileDrop__){"
-            "window.__plusui_fileDrop__(zoneName,files);"
-            "}"
-            // If no zone matched deliver to all registered zones so a
-            // single-zone app always works regardless of hit-test accuracy.
-            "if(!zoneName&&window.__plusui_fileDrop_default__){"
-            "window.__plusui_fileDrop_default__(files);"
-            "}"
-            "})();";
+  static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
+    Impl *impl = nullptr;
+    if (msg == WM_NCCREATE) {
+      auto cs = (LPCREATESTRUCT)lp;
+      impl = (Impl *)cs->lpCreateParams;
+      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)impl);
+    } else {
+      impl = (Impl *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    }
 
-        targetImpl->webview->ExecuteScript(
-            std::wstring(eventScript.begin(), eventScript.end()).c_str(),
-            nullptr);
-        return 0;
-      }
+    if (impl) {
+      switch (msg) {
+      case WM_MOVE: {
+        int x = (int)(short)LOWORD(lp);
+        int y = (int)(short)HIWORD(lp);
+        impl->state.x = x;
+        impl->state.y = y;
+        for (auto &cb : impl->moveCallbacks)
+          cb(x, y);
+        break;
+      }
+      case WM_SIZE: {
+        int width = LOWORD(lp);
+        int height = HIWORD(lp);
+        impl->state.width = width;
+        impl->state.height = height;
+        for (auto &cb : impl->resizeCallbacks)
+          cb(width, height);
+        break;
+      }
+      case WM_CLOSE:
+        for (auto &cb : impl->closeCallbacks)
+          cb();
+        break;
       case WM_HOTKEY: {
         int hotKeyId = (int)wp;
         auto it = impl->hotkeys.find(hotKeyId);
@@ -439,683 +338,719 @@ struct Window::Impl {
     }
     return DefWindowProc(hwnd, msg, wp, lp);
   }
-#elif defined(__APPLE__)
-  WKWebView *wkWebView = nullptr;
-#else
-  WebKitWebView *gtkWebView = nullptr;
-#endif
-};
-
-Window::Window() : pImpl(std::shared_ptr<Impl>(new Impl())) {}
-
-#ifdef _WIN32
-std::map<HWND, Window::Impl *> Window::Impl::embeddedWebviewByParent;
-#endif
-
-Window::~Window() = default;
-
-Window::Window(Window &&other) noexcept = default;
-Window &Window::operator=(Window &&other) noexcept = default;
-
-Window Window::create(const WindowConfig &config) {
-  Window w;
-  w.pImpl->config = config;
-
-#ifdef _WIN32
-  WNDCLASSEXW wc = {};
-  wc.cbSize = sizeof(WNDCLASSEXW);
-  wc.lpfnWndProc = Impl::wndProc;
-  wc.hInstance = GetModuleHandle(nullptr);
-  wc.lpszClassName = L"PLUSUI_WINDOW";
-  wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
-  wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
-  RegisterClassExW(&wc);
-
-  DWORD style = 0;
-  DWORD exStyle = 0;
-
-  if (config.decorations) {
-    style = WS_OVERLAPPEDWINDOW;
-    if (!config.resizable)
-      style &= ~WS_THICKFRAME;
-    if (!config.minimizable)
-      style &= ~WS_MINIMIZEBOX;
-    if (!config.closable)
-      style &= ~WS_SYSMENU;
-  } else {
-    // Frameless window
-    style = WS_POPUP;
-    if (config.resizable)
-      style |= WS_THICKFRAME;
-  }
-
-  if (config.transparent) {
-    exStyle = WS_EX_LAYERED;
-  }
-
-  if (config.skipTaskbar) {
-    exStyle |= WS_EX_TOOLWINDOW;
-  }
-
-  std::wstring wideTitle(config.title.begin(), config.title.end());
-  w.pImpl->hwnd = CreateWindowExW(
-      exStyle, L"PLUSUI_WINDOW", wideTitle.c_str(), style,
-      config.x >= 0 ? config.x : CW_USEDEFAULT,
-      config.y >= 0 ? config.y : CW_USEDEFAULT, config.width, config.height,
-      nullptr, nullptr, GetModuleHandle(nullptr), w.pImpl.get());
-
-  w.pImpl->nativeWindow = (void *)w.pImpl->hwnd;
-  w.pImpl->state.width = config.width;
-  w.pImpl->state.height = config.height;
-
-  DragAcceptFiles(w.pImpl->hwnd, config.fileDrop ? TRUE : FALSE);
-
-  if (config.center) {
-    RECT screen;
-    SystemParametersInfo(SPI_GETWORKAREA, 0, &screen, 0);
-    int x = (screen.right - config.width) / 2;
-    int y = (screen.bottom - config.height) / 2;
-    SetWindowPos(w.pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-  }
-
-  if (config.alwaysOnTop) {
-    SetWindowPos(w.pImpl->hwnd, HWND_TOPMOST, 0, 0, 0, 0,
-                 SWP_NOMOVE | SWP_NOSIZE);
-  }
-
-#elif defined(__APPLE__)
-  NSWindow *nswin = [[NSWindow alloc]
-      initWithContentRect:NSMakeRect(config.x >= 0 ? config.x : 100,
-                                     config.y >= 0 ? config.y : 100,
-                                     config.width, config.height)
-                styleMask:(config.resizable ? NSWindowStyleMaskResizable : 0) |
-                          NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
-                          (config.minimizable ? NSWindowStyleMaskMiniaturizable
-                                              : 0)backing:NSBackingStoreBuffered
-                    defer:NO];
-
-  [nswin setTitle:[NSString stringWithUTF8String:config.title.c_str()]];
-  [nswin setReleasedWhenClosed:NO];
-
-  if (config.center) {
-    [nswin center];
-  }
-
-  if (config.alwaysOnTop) {
-    [nswin setLevel:NSFloatingWindowLevel];
-  }
-
-  w.pImpl->nativeWindow = (__bridge void *)nswin;
-
-#else
-  gtk_init_check(0, nullptr);
-
-  GtkWindow *gtkwin = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
-  gtk_window_set_title(gtkwin, config.title.c_str());
-  gtk_window_set_default_size(gtkwin, config.width, config.height);
-
-  if (config.x >= 0 && config.y >= 0) {
-    gtk_window_move(gtkwin, config.x, config.y);
-  } else if (config.center) {
-    gtk_window_set_position(gtkwin, GTK_WIN_POS_CENTER);
-  }
-
-  if (!config.resizable) {
-    gtk_window_set_resizable(gtkwin, FALSE);
-  }
-
-  if (config.alwaysOnTop) {
-    gtk_window_set_keep_above(gtkwin, TRUE);
-  }
-
-  w.pImpl->nativeWindow = (void *)gtkwin;
-#endif
-
-  // Initialize tray manager for native windows
-  w.pImpl->trayManager = std::make_unique<TrayManager>();
-#ifdef _WIN32
-  if (w.pImpl->hwnd) {
-    w.pImpl->trayManager->setWindowHandle((void *)w.pImpl->hwnd);
-  }
-#elif defined(__APPLE__)
-  w.pImpl->trayManager->setWindowHandle(w.pImpl->nativeWindow);
-#else
-  w.pImpl->trayManager->setWindowHandle(w.pImpl->nativeWindow);
-#endif
-
-  return w;
-}
-
-void Window::setTitle(const std::string &title) {
-  pImpl->config.title = title;
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    std::wstring wideTitle(title.begin(), title.end());
-    SetWindowTextW(pImpl->hwnd, wideTitle.c_str());
-  }
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin setTitle:[NSString stringWithUTF8String:title.c_str()]];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_set_title(GTK_WINDOW(pImpl->nativeWindow), title.c_str());
-  }
-#endif
-}
-
-std::string Window::getTitle() const {
-  if (!pImpl->currentTitle.empty())
-    return pImpl->currentTitle;
-  return pImpl->config.title;
-}
-
-void Window::setSize(int width, int height) {
-  pImpl->config.width = width;
-  pImpl->config.height = height;
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    SetWindowPos(pImpl->hwnd, nullptr, 0, 0, width, height,
-                 SWP_NOZORDER | SWP_NOMOVE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin setContentSize:NSMakeSize(width, height)];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_resize(GTK_WINDOW(pImpl->nativeWindow), width, height);
-  }
-#endif
-}
-
-void Window::getSize(int &width, int &height) const {
-  width = pImpl->state.width;
-  height = pImpl->state.height;
-}
-
-void Window::setMinSize(int minWidth, int minHeight) {
-  pImpl->config.minWidth = minWidth;
-  pImpl->config.minHeight = minHeight;
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
-                     GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_THICKFRAME);
-  }
-#endif
-}
-
-void Window::setMaxSize(int maxWidth, int maxHeight) {
-  pImpl->config.maxWidth = maxWidth;
-  pImpl->config.maxHeight = maxHeight;
-}
-
-void Window::setPosition(int x, int y) {
-  pImpl->config.x = x;
-  pImpl->config.y = y;
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    SetWindowPos(pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin setFrameOrigin:NSMakePoint(x, y)];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_move(GTK_WINDOW(pImpl->nativeWindow), x, y);
-  }
-#endif
-}
-
-void Window::getPosition(int &x, int &y) const {
-  x = pImpl->state.x;
-  y = pImpl->state.y;
-}
-
-void Window::center() {
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    RECT rc, screen;
-    GetWindowRect(pImpl->hwnd, &rc);
-    SystemParametersInfo(SPI_GETWORKAREA, 0, &screen, 0);
-    int x = (screen.right - (rc.right - rc.left)) / 2;
-    int y = (screen.bottom - (rc.bottom - rc.top)) / 2;
-    SetWindowPos(pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-  }
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin center];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_set_position(GTK_WINDOW(pImpl->nativeWindow),
-                            GTK_WIN_POS_CENTER);
-  }
-#endif
-}
-
-void Window::setFullscreen(bool enabled) {
-  bool wasFullscreen = pImpl->state.isFullscreen;
-  pImpl->config.fullscreen = enabled;
-  pImpl->state.isFullscreen = enabled;
-  pImpl->state.isHidden = false;
-
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    if (enabled) {
-      SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
-                       GetWindowLong(pImpl->hwnd, GWL_STYLE) &
-                           ~WS_OVERLAPPEDWINDOW);
-      SetWindowPos(pImpl->hwnd, HWND_TOP, 0, 0, GetSystemMetrics(SM_CXSCREEN),
-                   GetSystemMetrics(SM_CYSCREEN), SWP_SHOWWINDOW);
-    } else {
-      SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
-                       GetWindowLong(pImpl->hwnd, GWL_STYLE) |
-                           WS_OVERLAPPEDWINDOW);
-      SetWindowPos(pImpl->hwnd, nullptr, 0, 0, 0, 0,
-                   SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
-    }
-  }
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    if (enabled) {
-      [nswin toggleFullScreen:nil];
-    }
-  }
-#else
-  if (pImpl->nativeWindow) {
-    if (enabled) {
-      gtk_window_fullscreen(GTK_WINDOW(pImpl->nativeWindow));
-    } else {
-      gtk_window_unfullscreen(GTK_WINDOW(pImpl->nativeWindow));
-    }
-  }
-#endif
-
-  if (wasFullscreen != enabled) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-bool Window::isFullscreen() const { return pImpl->state.isFullscreen; }
-
-void Window::minimize() {
-  bool wasMinimized = pImpl->state.isMinimized;
-  pImpl->state.isMinimized = true;
-  pImpl->state.isHidden = false;
-
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    ShowWindow(pImpl->hwnd, SW_MINIMIZE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin miniaturize:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_iconify(GTK_WINDOW(pImpl->nativeWindow));
-  }
-#endif
-
-  if (!wasMinimized) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-void Window::maximize() {
-  bool wasMaximized = pImpl->state.isMaximized;
-  pImpl->state.isMaximized = true;
-  pImpl->state.isHidden = false;
-
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    ShowWindow(pImpl->hwnd, SW_MAXIMIZE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin zoom:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_maximize(GTK_WINDOW(pImpl->nativeWindow));
-  }
-#endif
-
-  if (!wasMaximized) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-void Window::restore() {
-  bool wasMinimized = pImpl->state.isMinimized;
-  bool wasMaximized = pImpl->state.isMaximized;
-  pImpl->state.isMinimized = false;
-  pImpl->state.isMaximized = false;
-  pImpl->state.isHidden = false;
-
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    ShowWindow(pImpl->hwnd, SW_RESTORE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin deminiaturize:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_unmaximize(GTK_WINDOW(pImpl->nativeWindow));
-    gtk_window_deiconify(GTK_WINDOW(pImpl->nativeWindow));
-  }
-#endif
-
-  if (wasMinimized || wasMaximized) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-bool Window::isMaximized() const { return pImpl->state.isMaximized; }
-
-bool Window::isMinimized() const { return pImpl->state.isMinimized; }
-
-void Window::show() {
-  bool wasHidden = pImpl->state.isHidden;
-  pImpl->state.isVisible = true;
-  pImpl->state.isHidden = false;
-
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    ShowWindow(pImpl->hwnd, SW_SHOW);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin orderFront:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_widget_show(GTK_WIDGET(pImpl->nativeWindow));
-  }
-#endif
-
-  // Fire state change event if hidden state changed
-  if (wasHidden) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-void Window::hide() {
-  bool wasVisible = pImpl->state.isVisible;
-  pImpl->state.isVisible = false;
-  pImpl->state.isHidden = true;
-
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    ShowWindow(pImpl->hwnd, SW_HIDE);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin orderOut:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_widget_hide(GTK_WIDGET(pImpl->nativeWindow));
-  }
-#endif
-
-  // Fire state change event if visibility changed
-  if (wasVisible) {
-    for (auto &cb : pImpl->stateCallbacks)
-      cb(pImpl->state);
-  }
-}
-
-bool Window::isVisible() const { return pImpl->state.isVisible; }
-
-bool Window::isHidden() const { return pImpl->state.isHidden; }
-
-void Window::focus() {
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    SetFocus(pImpl->hwnd);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin makeKeyAndOrderFront:nil];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_present(GTK_WINDOW(pImpl->nativeWindow));
-  }
-#endif
-}
-
-bool Window::isFocused() const { return pImpl->state.isFocused; }
-
-void Window::setAlwaysOnTop(bool enabled) {
-  pImpl->config.alwaysOnTop = enabled;
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    SetWindowPos(pImpl->hwnd, enabled ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0,
-                 0, SWP_NOMOVE | SWP_NOSIZE);
-  }
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin setLevel:enabled ? NSFloatingWindowLevel : NSNormalWindowLevel];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_set_keep_above(GTK_WINDOW(pImpl->nativeWindow), enabled);
-  }
-#endif
-}
-
-void Window::setResizable(bool enabled) {
-  pImpl->config.resizable = enabled;
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    SetWindowLongPtr(
-        pImpl->hwnd, GWL_STYLE,
-        enabled ? GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_THICKFRAME
-                : GetWindowLong(pImpl->hwnd, GWL_STYLE) & ~WS_THICKFRAME);
-  }
-#elif defined(__APPLE__)
-  // Handled in create
-#else
-  if (pImpl->nativeWindow) {
-    gtk_window_set_resizable(GTK_WINDOW(pImpl->nativeWindow), enabled);
-  }
-#endif
-}
-
-void Window::setDecorations(bool enabled) {
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
-                     enabled
-                         ? GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_CAPTION
-                         : GetWindowLong(pImpl->hwnd, GWL_STYLE) & ~WS_CAPTION);
-  }
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin setStyleMask:enabled ? [nswin styleMask] | NSWindowStyleMaskTitled
-                                : [nswin styleMask] & ~NSWindowStyleMaskTitled];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    // GTK handles this differently
-  }
-#endif
-}
-
-void Window::setSkipTaskbar(bool enabled) {
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    SetWindowLongPtr(
-        pImpl->hwnd, GWL_EXSTYLE,
-        enabled ? GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) | WS_EX_TOOLWINDOW
-                : GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) & ~WS_EX_TOOLWINDOW);
-  }
-#endif
-}
-
-void Window::setOpacity(double opacity) {
-  pImpl->config.opacity = opacity;
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    BYTE alpha = static_cast<BYTE>(opacity * 255);
-    SetWindowLongPtr(pImpl->hwnd, GWL_EXSTYLE,
-                     GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
-    SetLayeredWindowAttributes(pImpl->hwnd, 0, alpha, LWA_ALPHA);
-  }
-#endif
-}
-
-void Window::setIconFromMemory(const unsigned char *data, size_t size) {
-#ifdef _WIN32
-  if (pImpl->hwnd) {
-    int width, height, channels;
-    unsigned char *pixels =
-        stbi_load_from_memory(data, (int)size, &width, &height, &channels, 4);
-    if (pixels) {
-      BITMAPINFO bmi = {};
-      bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-      bmi.bmiHeader.biWidth = width;
-      bmi.bmiHeader.biHeight = -height;
-      bmi.bmiHeader.biPlanes = 1;
-      bmi.bmiHeader.biBitCount = 32;
-      bmi.bmiHeader.biCompression = BI_RGB;
-
-      void *bits = nullptr;
-      HBITMAP hbm =
-          CreateDIBSection(nullptr, &bmi, DIB_RGB_COLORS, &bits, nullptr, 0);
-      if (hbm && bits) {
-        // Convert RGBA to BGRA
-        for (int i = 0; i < width * height; ++i) {
-          ((uint8_t *)bits)[i * 4 + 0] = pixels[i * 4 + 2];
-          ((uint8_t *)bits)[i * 4 + 1] = pixels[i * 4 + 1];
-          ((uint8_t *)bits)[i * 4 + 2] = pixels[i * 4 + 0];
-          ((uint8_t *)bits)[i * 4 + 3] = pixels[i * 4 + 3];
-        }
-
-        ICONINFO ii = {};
-        ii.fIcon = TRUE;
-        ii.hbmColor = hbm;
-        ii.hbmMask = hbm;
-
-        HICON hIcon = CreateIconIndirect(&ii);
-        if (hIcon) {
-          SendMessage(pImpl->hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
-          SendMessage(pImpl->hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
-        }
-        DeleteObject(hbm);
-      }
-      stbi_image_free(pixels);
-    }
-  }
-#endif
-}
-
-WindowState Window::getState() const { return pImpl->state; }
-
-void Window::close() {
-#ifdef _WIN32
-  if (pImpl->hwnd)
-    PostMessage(pImpl->hwnd, WM_CLOSE, 0, 0);
-#elif defined(__APPLE__)
-  if (pImpl->nativeWindow) {
-    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
-    [nswin close];
-  }
-#else
-  if (pImpl->nativeWindow) {
-    gtk_widget_destroy(GTK_WIDGET(pImpl->nativeWindow));
-  }
-#endif
-}
-
-void Window::onMove(MoveCallback callback) {
-  pImpl->moveCallbacks.push_back(callback);
-}
-
-void Window::onResize(ResizeCallback callback) {
-  pImpl->resizeCallbacks.push_back(callback);
-}
-
-void Window::onClose(CloseCallback callback) {
-  pImpl->closeCallbacks.push_back(callback);
-}
-
-void Window::onFocus(FocusCallback callback) {
-  pImpl->focusCallbacks.push_back(callback);
-}
-
-void Window::onStateChange(StateCallback callback) {
-  pImpl->stateCallbacks.push_back(callback);
-}
-
-void *Window::nativeHandle() const { return pImpl->nativeWindow; }
-
-// WebView-specific implementations
-Window Window::create(void *windowHandle, const WindowConfig &config) {
-  Window win;
-  win.pImpl->config = config;
-
-  // Pure native file-drop mode: when native FileDrop is enabled,
-  // fully disable browser/WebView drag-drop handling.
-  if (win.pImpl->config.fileDrop) {
-    win.pImpl->config.disableWebviewDragDrop = true;
-  }
-
-#ifdef _WIN32
-  HWND hwnd = static_cast<HWND>(windowHandle);
-
-  // Create WebView2 environment and controller
-  auto pImpl = win.pImpl;
-  CreateCoreWebView2EnvironmentWithOptions(
-      nullptr, nullptr, nullptr,
-      Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(
-          [hwnd, pImpl](HRESULT result,
-                        ICoreWebView2Environment *env) -> HRESULT {
-            if (FAILED(result) || !env)
-              return result;
-            env->CreateCoreWebView2Controller(
-                hwnd,
-                Callback<
-                    ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
-                    [pImpl](HRESULT result,
-                            ICoreWebView2Controller *controller) -> HRESULT {
-                      (void)result; // Suppress unused warning
-                      if (controller != nullptr) {
-                        pImpl->controller = controller;
-                        controller->get_CoreWebView2(&pImpl->webview);
-
-                        RECT bounds;
-                        HWND parentHwnd;
-                        controller->get_ParentWindow(&parentHwnd);
-                        GetClientRect(parentHwnd, &bounds);
-                        controller->put_Bounds(bounds);
-                        Window::Impl::embeddedWebviewByParent[parentHwnd] =
-                            pImpl.get();
-
-                        // AllowExternalDrop must be TRUE so that drag-
-                        // related DOM events (dragenter, dragover, dragleave,
-                        // drop) fire inside the webview.  Our injected JS
-                        // calls preventDefault() on all of them to stop the
-                        // browser from navigating to the dropped file.
-                        // The parent HWND still receives WM_DROPFILES via
-                        // DragAcceptFiles, which is where we extract file
-                        // metadata and push it into JavaScript.
+#elif defined(__APPLE__)
+  WKWebView *wkWebView = nullptr;
+#else
+  WebKitWebView *gtkWebView = nullptr;
+#endif
+};
+
+#ifdef _WIN32
+
+#endif // _WIN32
+
+Window::Window() : pImpl(std::shared_ptr<Impl>(new Impl())) {}
+
+#ifdef _WIN32
+std::map<HWND, Window::Impl *> Window::Impl::embeddedWebviewByParent;
+#endif
+
+Window::~Window() = default;
+
+Window::Window(Window &&other) noexcept = default;
+Window &Window::operator=(Window &&other) noexcept = default;
+
+Window Window::create(const WindowConfig &config) {
+  Window w;
+  w.pImpl->config = config;
+
+#ifdef _WIN32
+  WNDCLASSEXW wc = {};
+  wc.cbSize = sizeof(WNDCLASSEXW);
+  wc.lpfnWndProc = Impl::wndProc;
+  wc.hInstance = GetModuleHandle(nullptr);
+  wc.lpszClassName = L"PLUSUI_WINDOW";
+  wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
+  wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
+  RegisterClassExW(&wc);
+
+  DWORD style = 0;
+  DWORD exStyle = 0;
+
+  if (config.decorations) {
+    style = WS_OVERLAPPEDWINDOW;
+    if (!config.resizable)
+      style &= ~WS_THICKFRAME;
+    if (!config.minimizable)
+      style &= ~WS_MINIMIZEBOX;
+    if (!config.closable)
+      style &= ~WS_SYSMENU;
+  } else {
+    // Frameless window
+    style = WS_POPUP;
+    if (config.resizable)
+      style |= WS_THICKFRAME;
+  }
+
+  if (config.transparent) {
+    exStyle = WS_EX_LAYERED;
+  }
+
+  if (config.skipTaskbar) {
+    exStyle |= WS_EX_TOOLWINDOW;
+  }
+
+  std::wstring wideTitle(config.title.begin(), config.title.end());
+  w.pImpl->hwnd = CreateWindowExW(
+      exStyle, L"PLUSUI_WINDOW", wideTitle.c_str(), style,
+      config.x >= 0 ? config.x : CW_USEDEFAULT,
+      config.y >= 0 ? config.y : CW_USEDEFAULT, config.width, config.height,
+      nullptr, nullptr, GetModuleHandle(nullptr), w.pImpl.get());
+
+  w.pImpl->nativeWindow = (void *)w.pImpl->hwnd;
+  w.pImpl->state.width = config.width;
+  w.pImpl->state.height = config.height;
+
+  if (config.center) {
+    RECT screen;
+    SystemParametersInfo(SPI_GETWORKAREA, 0, &screen, 0);
+    int x = (screen.right - config.width) / 2;
+    int y = (screen.bottom - config.height) / 2;
+    SetWindowPos(w.pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+  }
+
+  if (config.alwaysOnTop) {
+    SetWindowPos(w.pImpl->hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+                 SWP_NOMOVE | SWP_NOSIZE);
+  }
+
+#elif defined(__APPLE__)
+  NSWindow *nswin = [[NSWindow alloc]
+      initWithContentRect:NSMakeRect(config.x >= 0 ? config.x : 100,
+                                     config.y >= 0 ? config.y : 100,
+                                     config.width, config.height)
+                styleMask:(config.resizable ? NSWindowStyleMaskResizable : 0) |
+                          NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
+                          (config.minimizable ? NSWindowStyleMaskMiniaturizable
+                                              : 0)backing:NSBackingStoreBuffered
+                    defer:NO];
+
+  [nswin setTitle:[NSString stringWithUTF8String:config.title.c_str()]];
+  [nswin setReleasedWhenClosed:NO];
+
+  if (config.center) {
+    [nswin center];
+  }
+
+  if (config.alwaysOnTop) {
+    [nswin setLevel:NSFloatingWindowLevel];
+  }
+
+  w.pImpl->nativeWindow = (__bridge void *)nswin;
+
+#else
+  // Force the X11 GDK backend so window positioning and XGrabKey shortcuts work.
+  // On a Wayland session this uses XWayland transparently.
+  // Must be set before gtk_init and must override any compositor-set GDK_BACKEND.
+  setenv("GDK_BACKEND", "x11", 1);
+  gtk_init_check(0, nullptr);
+
+  GtkWindow *gtkwin = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+  gtk_window_set_title(gtkwin, config.title.c_str());
+  gtk_window_set_default_size(gtkwin, config.width, config.height);
+
+  if (config.x >= 0 && config.y >= 0) {
+    gtk_window_move(gtkwin, config.x, config.y);
+  } else if (config.center) {
+    gtk_window_set_position(gtkwin, GTK_WIN_POS_CENTER);
+  }
+
+  if (!config.resizable) {
+    gtk_window_set_resizable(gtkwin, FALSE);
+  }
+
+  if (config.alwaysOnTop) {
+    gtk_window_set_keep_above(gtkwin, TRUE);
+  }
+
+  w.pImpl->nativeWindow = (void *)gtkwin;
+#endif
+
+  // Initialize tray manager for native windows
+  w.pImpl->trayManager = std::make_unique<TrayManager>();
+#ifdef _WIN32
+  if (w.pImpl->hwnd) {
+    w.pImpl->trayManager->setWindowHandle((void *)w.pImpl->hwnd);
+  }
+#elif defined(__APPLE__)
+  w.pImpl->trayManager->setWindowHandle(w.pImpl->nativeWindow);
+#else
+  w.pImpl->trayManager->setWindowHandle(w.pImpl->nativeWindow);
+#endif
+
+  return w;
+}
+
+void Window::setTitle(const std::string &title) {
+  pImpl->config.title = title;
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    std::wstring wideTitle(title.begin(), title.end());
+    SetWindowTextW(pImpl->hwnd, wideTitle.c_str());
+  }
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin setTitle:[NSString stringWithUTF8String:title.c_str()]];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_set_title(GTK_WINDOW(pImpl->nativeWindow), title.c_str());
+  }
+#endif
+}
+
+std::string Window::getTitle() const {
+  if (!pImpl->currentTitle.empty())
+    return pImpl->currentTitle;
+  return pImpl->config.title;
+}
+
+void Window::setSize(int width, int height) {
+  pImpl->config.width = width;
+  pImpl->config.height = height;
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    SetWindowPos(pImpl->hwnd, nullptr, 0, 0, width, height,
+                 SWP_NOZORDER | SWP_NOMOVE);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin setContentSize:NSMakeSize(width, height)];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_resize(GTK_WINDOW(pImpl->nativeWindow), width, height);
+  }
+#endif
+}
+
+void Window::getSize(int &width, int &height) const {
+  width = pImpl->state.width;
+  height = pImpl->state.height;
+}
+
+void Window::setMinSize(int minWidth, int minHeight) {
+  pImpl->config.minWidth = minWidth;
+  pImpl->config.minHeight = minHeight;
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
+                     GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_THICKFRAME);
+  }
+#endif
+}
+
+void Window::setMaxSize(int maxWidth, int maxHeight) {
+  pImpl->config.maxWidth = maxWidth;
+  pImpl->config.maxHeight = maxHeight;
+}
+
+void Window::setPosition(int x, int y) {
+  pImpl->config.x = x;
+  pImpl->config.y = y;
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    SetWindowPos(pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin setFrameOrigin:NSMakePoint(x, y)];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_move(GTK_WINDOW(pImpl->nativeWindow), x, y);
+  }
+#endif
+}
+
+void Window::getPosition(int &x, int &y) const {
+  x = pImpl->state.x;
+  y = pImpl->state.y;
+}
+
+void Window::center() {
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    RECT rc, screen;
+    GetWindowRect(pImpl->hwnd, &rc);
+    SystemParametersInfo(SPI_GETWORKAREA, 0, &screen, 0);
+    int x = (screen.right - (rc.right - rc.left)) / 2;
+    int y = (screen.bottom - (rc.bottom - rc.top)) / 2;
+    SetWindowPos(pImpl->hwnd, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+  }
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin center];
+  }
+#else
+  // gtk_window_set_position(GTK_WIN_POS_CENTER) is a map-time hint only —
+  // it does nothing on an already-visible window.  Use GDK geometry to
+  // calculate the centre and move the window explicitly, matching Windows.
+  {
+    GtkWindow *gtkwin = nullptr;
+    if (pImpl->nativeWindow)
+      gtkwin = GTK_WINDOW(pImpl->nativeWindow);
+    else if (pImpl->window && pImpl->window->pImpl->nativeWindow)
+      gtkwin = GTK_WINDOW(pImpl->window->pImpl->nativeWindow);
+    if (gtkwin) {
+      GdkDisplay *display = gdk_display_get_default();
+      GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
+      if (!monitor) monitor = gdk_display_get_monitor(display, 0);
+      if (monitor) {
+        GdkRectangle geo;
+        gdk_monitor_get_geometry(monitor, &geo);
+        int w = 0, h = 0;
+        gtk_window_get_size(gtkwin, &w, &h);
+        gtk_window_move(gtkwin,
+                        geo.x + (geo.width  - w) / 2,
+                        geo.y + (geo.height - h) / 2);
+      }
+    }
+  }
+#endif
+}
+
+void Window::setFullscreen(bool enabled) {
+  bool wasFullscreen = pImpl->state.isFullscreen;
+  pImpl->config.fullscreen = enabled;
+  pImpl->state.isFullscreen = enabled;
+  pImpl->state.isHidden = false;
+
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    if (enabled) {
+      SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
+                       GetWindowLong(pImpl->hwnd, GWL_STYLE) &
+                           ~WS_OVERLAPPEDWINDOW);
+      SetWindowPos(pImpl->hwnd, HWND_TOP, 0, 0, GetSystemMetrics(SM_CXSCREEN),
+                   GetSystemMetrics(SM_CYSCREEN), SWP_SHOWWINDOW);
+    } else {
+      SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
+                       GetWindowLong(pImpl->hwnd, GWL_STYLE) |
+                           WS_OVERLAPPEDWINDOW);
+      SetWindowPos(pImpl->hwnd, nullptr, 0, 0, 0, 0,
+                   SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+    }
+  }
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    if (enabled) {
+      [nswin toggleFullScreen:nil];
+    }
+  }
+#else
+  if (pImpl->nativeWindow) {
+    if (enabled) {
+      gtk_window_fullscreen(GTK_WINDOW(pImpl->nativeWindow));
+    } else {
+      gtk_window_unfullscreen(GTK_WINDOW(pImpl->nativeWindow));
+    }
+  }
+#endif
+
+  if (wasFullscreen != enabled) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+bool Window::isFullscreen() const { return pImpl->state.isFullscreen; }
+
+void Window::minimize() {
+  bool wasMinimized = pImpl->state.isMinimized;
+  pImpl->state.isMinimized = true;
+  pImpl->state.isHidden = false;
+
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    ShowWindow(pImpl->hwnd, SW_MINIMIZE);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin miniaturize:nil];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_iconify(GTK_WINDOW(pImpl->nativeWindow));
+  }
+#endif
+
+  if (!wasMinimized) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+void Window::maximize() {
+  bool wasMaximized = pImpl->state.isMaximized;
+  pImpl->state.isMaximized = true;
+  pImpl->state.isHidden = false;
+
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    ShowWindow(pImpl->hwnd, SW_MAXIMIZE);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin zoom:nil];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_maximize(GTK_WINDOW(pImpl->nativeWindow));
+  }
+#endif
+
+  if (!wasMaximized) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+void Window::restore() {
+  bool wasMinimized = pImpl->state.isMinimized;
+  bool wasMaximized = pImpl->state.isMaximized;
+  pImpl->state.isMinimized = false;
+  pImpl->state.isMaximized = false;
+  pImpl->state.isHidden = false;
+
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    ShowWindow(pImpl->hwnd, SW_RESTORE);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin deminiaturize:nil];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_unmaximize(GTK_WINDOW(pImpl->nativeWindow));
+    gtk_window_deiconify(GTK_WINDOW(pImpl->nativeWindow));
+  }
+#endif
+
+  if (wasMinimized || wasMaximized) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+bool Window::isMaximized() const { return pImpl->state.isMaximized; }
+
+bool Window::isMinimized() const { return pImpl->state.isMinimized; }
+
+void Window::show() {
+  bool wasHidden = pImpl->state.isHidden;
+  pImpl->state.isVisible = true;
+  pImpl->state.isHidden = false;
+
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    ShowWindow(pImpl->hwnd, SW_SHOW);
+  else if (pImpl->window)
+    pImpl->window->show();
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin orderFront:nil];
+  } else if (pImpl->window) {
+    pImpl->window->show();
+  }
+#else
+  if (pImpl->nativeWindow) {
+    // show_all reveals the window and all child widgets (e.g. the webview)
+    gtk_widget_show_all(GTK_WIDGET(pImpl->nativeWindow));
+  } else if (pImpl->window) {
+    pImpl->window->show();
+  }
+#endif
+
+  // Fire state change event if hidden state changed
+  if (wasHidden) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+void Window::hide() {
+  bool wasVisible = pImpl->state.isVisible;
+  pImpl->state.isVisible = false;
+  pImpl->state.isHidden = true;
+
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    ShowWindow(pImpl->hwnd, SW_HIDE);
+  else if (pImpl->window)
+    pImpl->window->hide();
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin orderOut:nil];
+  } else if (pImpl->window) {
+    pImpl->window->hide();
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_widget_hide(GTK_WIDGET(pImpl->nativeWindow));
+  } else if (pImpl->window) {
+    pImpl->window->hide();
+  }
+#endif
+
+  // Fire state change event if visibility changed
+  if (wasVisible) {
+    for (auto &cb : pImpl->stateCallbacks)
+      cb(pImpl->state);
+  }
+}
+
+bool Window::isVisible() const { return pImpl->state.isVisible; }
+
+bool Window::isHidden() const { return pImpl->state.isHidden; }
+
+void Window::focus() {
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    SetFocus(pImpl->hwnd);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin makeKeyAndOrderFront:nil];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_present(GTK_WINDOW(pImpl->nativeWindow));
+  }
+#endif
+}
+
+bool Window::isFocused() const { return pImpl->state.isFocused; }
+
+void Window::setAlwaysOnTop(bool enabled) {
+  pImpl->config.alwaysOnTop = enabled;
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    SetWindowPos(pImpl->hwnd, enabled ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0,
+                 0, SWP_NOMOVE | SWP_NOSIZE);
+  }
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin setLevel:enabled ? NSFloatingWindowLevel : NSNormalWindowLevel];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_set_keep_above(GTK_WINDOW(pImpl->nativeWindow), enabled);
+  }
+#endif
+}
+
+void Window::setResizable(bool enabled) {
+  pImpl->config.resizable = enabled;
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    SetWindowLongPtr(
+        pImpl->hwnd, GWL_STYLE,
+        enabled ? GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_THICKFRAME
+                : GetWindowLong(pImpl->hwnd, GWL_STYLE) & ~WS_THICKFRAME);
+  }
+#elif defined(__APPLE__)
+  // Handled in create
+#else
+  if (pImpl->nativeWindow) {
+    gtk_window_set_resizable(GTK_WINDOW(pImpl->nativeWindow), enabled);
+  }
+#endif
+}
+
+void Window::setDecorations(bool enabled) {
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    SetWindowLongPtr(pImpl->hwnd, GWL_STYLE,
+                     enabled
+                         ? GetWindowLong(pImpl->hwnd, GWL_STYLE) | WS_CAPTION
+                         : GetWindowLong(pImpl->hwnd, GWL_STYLE) & ~WS_CAPTION);
+  }
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin setStyleMask:enabled ? [nswin styleMask] | NSWindowStyleMaskTitled
+                                : [nswin styleMask] & ~NSWindowStyleMaskTitled];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    // GTK handles this differently
+  }
+#endif
+}
+
+void Window::setSkipTaskbar(bool enabled) {
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    SetWindowLongPtr(
+        pImpl->hwnd, GWL_EXSTYLE,
+        enabled ? GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) | WS_EX_TOOLWINDOW
+                : GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) & ~WS_EX_TOOLWINDOW);
+  }
+#endif
+}
+
+void Window::setOpacity(double opacity) {
+  pImpl->config.opacity = opacity;
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    BYTE alpha = static_cast<BYTE>(opacity * 255);
+    SetWindowLongPtr(pImpl->hwnd, GWL_EXSTYLE,
+                     GetWindowLong(pImpl->hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
+    SetLayeredWindowAttributes(pImpl->hwnd, 0, alpha, LWA_ALPHA);
+  }
+#endif
+}
+
+void Window::setIconFromMemory(const unsigned char *data, size_t size) {
+#ifdef _WIN32
+  if (pImpl->hwnd) {
+    int width, height, channels;
+    unsigned char *pixels =
+        stbi_load_from_memory(data, (int)size, &width, &height, &channels, 4);
+    if (pixels) {
+      BITMAPINFO bmi = {};
+      bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+      bmi.bmiHeader.biWidth = width;
+      bmi.bmiHeader.biHeight = -height;
+      bmi.bmiHeader.biPlanes = 1;
+      bmi.bmiHeader.biBitCount = 32;
+      bmi.bmiHeader.biCompression = BI_RGB;
+
+      void *bits = nullptr;
+      HBITMAP hbm =
+          CreateDIBSection(nullptr, &bmi, DIB_RGB_COLORS, &bits, nullptr, 0);
+      if (hbm && bits) {
+        // Convert RGBA to BGRA
+        for (int i = 0; i < width * height; ++i) {
+          ((uint8_t *)bits)[i * 4 + 0] = pixels[i * 4 + 2];
+          ((uint8_t *)bits)[i * 4 + 1] = pixels[i * 4 + 1];
+          ((uint8_t *)bits)[i * 4 + 2] = pixels[i * 4 + 0];
+          ((uint8_t *)bits)[i * 4 + 3] = pixels[i * 4 + 3];
+        }
+
+        ICONINFO ii = {};
+        ii.fIcon = TRUE;
+        ii.hbmColor = hbm;
+        ii.hbmMask = hbm;
+
+        HICON hIcon = CreateIconIndirect(&ii);
+        if (hIcon) {
+          SendMessage(pImpl->hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
+          SendMessage(pImpl->hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
+        }
+        DeleteObject(hbm);
+      }
+      stbi_image_free(pixels);
+    }
+  }
+#endif
+}
+
+WindowState Window::getState() const { return pImpl->state; }
+
+void Window::close() {
+#ifdef _WIN32
+  if (pImpl->hwnd)
+    PostMessage(pImpl->hwnd, WM_CLOSE, 0, 0);
+#elif defined(__APPLE__)
+  if (pImpl->nativeWindow) {
+    NSWindow *nswin = (__bridge NSWindow *)pImpl->nativeWindow;
+    [nswin close];
+  }
+#else
+  if (pImpl->nativeWindow) {
+    gtk_widget_destroy(GTK_WIDGET(pImpl->nativeWindow));
+  }
+#endif
+}
+
+void Window::onMove(MoveCallback callback) {
+  pImpl->moveCallbacks.push_back(callback);
+}
+
+void Window::onResize(ResizeCallback callback) {
+  pImpl->resizeCallbacks.push_back(callback);
+}
+
+void Window::onClose(CloseCallback callback) {
+  pImpl->closeCallbacks.push_back(callback);
+}
+
+void Window::onFocus(FocusCallback callback) {
+  pImpl->focusCallbacks.push_back(callback);
+}
+
+void Window::onStateChange(StateCallback callback) {
+  pImpl->stateCallbacks.push_back(callback);
+}
+
+void *Window::nativeHandle() const { return pImpl->nativeWindow; }
+void *Window::nativeWebView() const { return pImpl->nativeWebView; }
+
+// WebView-specific implementations
+Window Window::create(void *windowHandle, const WindowConfig &config) {
+  Window win;
+  win.pImpl->config = config;
+
+  // Pure native file-drop mode: when native FileDrop is enabled,
+  // fully disable browser/WebView drag-drop handling.
+  if (win.pImpl->config.fileDrop) {
+    win.pImpl->config.disableWebviewDragDrop = true;
+  }
+
+#ifdef _WIN32
+  HWND hwnd = static_cast<HWND>(windowHandle);
+
+  // Create WebView2 environment and controller
+  auto pImpl = win.pImpl;
+  CreateCoreWebView2EnvironmentWithOptions(
+      nullptr, nullptr, nullptr,
+      Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(
+          [hwnd, pImpl](HRESULT result,
+                        ICoreWebView2Environment *env) -> HRESULT {
+            if (FAILED(result) || !env)
+              return result;
+            env->CreateCoreWebView2Controller(
+                hwnd,
+                Callback<
+                    ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+                    [pImpl](HRESULT result,
+                            ICoreWebView2Controller *controller) -> HRESULT {
+                      (void)result; // Suppress unused warning
+                      if (controller != nullptr) {
+                        pImpl->controller = controller;
+                        controller->get_CoreWebView2(&pImpl->webview);
+
+                        RECT bounds;
+                        HWND parentHwnd;
+                        controller->get_ParentWindow(&parentHwnd);
+                        GetClientRect(parentHwnd, &bounds);
+                        controller->put_Bounds(bounds);
+                        Window::Impl::embeddedWebviewByParent[parentHwnd] =
+                            pImpl.get();
+
+                        // AllowExternalDrop must be TRUE so that we can handle
+                        // drops via WebView2's DOM events + chrome.webview messaging.
+                        // The JS side catches the drop event and sends file data
+                        // to native via window.__native_invoke__.
                         ComPtr<ICoreWebView2Controller4> controller4;
                         if (controller &&
                             SUCCEEDED(controller->QueryInterface(
@@ -1123,35 +1058,35 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                             controller4) {
                           controller4->put_AllowExternalDrop(TRUE);
                         }
-
-                        pImpl->nativeWebView = pImpl->webview.Get();
-                        pImpl->ready = true;
-
-                        // Inject bridge script that runs on EVERY document
-                        // (survives navigation)
-                        std::string bridgeScript = R"(
-                            window.__native_invoke__ = function(request) {
-                                if (window.chrome && window.chrome.webview) {
-                                    window.chrome.webview.postMessage(request);
-                                }
-                            };
-                        )";
-                        pImpl->webview->AddScriptToExecuteOnDocumentCreated(
-                            std::wstring(bridgeScript.begin(),
-                                         bridgeScript.end())
-                                .c_str(),
-                            nullptr);
-
-                        // Inject scrollbar hiding CSS if disabled
-                        if (!pImpl->config.scrollbars) {
-                          std::string scrollbarScript = kHideScrollbarsScript;
-                          pImpl->webview->AddScriptToExecuteOnDocumentCreated(
-                              std::wstring(scrollbarScript.begin(),
-                                           scrollbarScript.end())
-                                  .c_str(),
-                              nullptr);
-                        }
-
+
+                        pImpl->nativeWebView = pImpl->webview.Get();
+                        pImpl->ready = true;
+
+                        // Inject bridge script that runs on EVERY document
+                        // (survives navigation)
+                        std::string bridgeScript = R"(
+                            window.__native_invoke__ = function(request) {
+                                if (window.chrome && window.chrome.webview) {
+                                    window.chrome.webview.postMessage(request);
+                                }
+                            };
+                        )";
+                        pImpl->webview->AddScriptToExecuteOnDocumentCreated(
+                            std::wstring(bridgeScript.begin(),
+                                         bridgeScript.end())
+                                .c_str(),
+                            nullptr);
+
+                        // Inject scrollbar hiding CSS if disabled
+                        if (!pImpl->config.scrollbars) {
+                          std::string scrollbarScript = kHideScrollbarsScript;
+                          pImpl->webview->AddScriptToExecuteOnDocumentCreated(
+                              std::wstring(scrollbarScript.begin(),
+                                           scrollbarScript.end())
+                                  .c_str(),
+                              nullptr);
+                        }
+
                         // Block browser default drag-drop behavior (prevents
                         // the browser from navigating to the dropped file) while
                         // still allowing visual feedback on drop zones.
@@ -1227,6 +1162,43 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                               e.preventDefault();
                               dragDepth = 0;
                               updateActiveZone(null);
+                              
+                              // Process dropped files and send to native
+                              if (e.dataTransfer && e.dataTransfer.files) {
+                                var files = [];
+                                for (var i = 0; i < e.dataTransfer.files.length; i++) {
+                                  var file = e.dataTransfer.files[i];
+                                  files.push({
+                                    name: file.name,
+                                    size: file.size,
+                                    type: file.type || 'application/octet-stream'
+                                  });
+                                }
+                                
+                                // Send file info to native via the bridge
+                                if (window.__native_invoke__) {
+                                  var request = JSON.stringify({
+                                    method: 'plusui:fileDrop',
+                                    params: { files: files }
+                                  });
+                                  window.__native_invoke__(request);
+                                }
+                                
+                                // Also dispatch custom event for JS listeners
+                                window.dispatchEvent(new CustomEvent('plusui:fileDrop.filesDropped', {
+                                  detail: { files: files }
+                                }));
+                                
+                                // Call zone-specific handler if exists
+                                var zone = findDropZone(e);
+                                var zoneName = zone ? zone.getAttribute('data-dropzone') : null;
+                                if (zoneName && window.__plusui_fileDrop__) {
+                                  window.__plusui_fileDrop__(zoneName, files);
+                                }
+                                if (!zoneName && window.__plusui_fileDrop_default__) {
+                                  window.__plusui_fileDrop_default__(files);
+                                }
+                              }
                             }, true);
 
                             // Also block at window level as a safety net
@@ -1240,428 +1212,450 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                 .c_str(),
                             nullptr);
 
-                        // Set up WebMessageReceived handler for JS->C++ bridge
-                        pImpl->webview->add_WebMessageReceived(
-                            Callback<
-                                ICoreWebView2WebMessageReceivedEventHandler>(
-                                [pImpl](ICoreWebView2 *sender,
-                                        ICoreWebView2WebMessageReceivedEventArgs
-                                            *args) -> HRESULT {
-                                  (void)sender; // Suppress unused warning
-                                  LPWSTR message = nullptr;
-                                  args->TryGetWebMessageAsString(&message);
-                                  if (!message)
-                                    return S_OK;
-                                  std::wstring wmsg(message);
-#pragma warning(push)
-#pragma warning(disable : 4244) // Suppress wchar_t to char conversion warning
-                                  std::string msg(wmsg.begin(), wmsg.end());
-#pragma warning(pop)
-                                  CoTaskMemFree(message);
-
-                                  // Debug: log received message
-                                  std::cout << "[PlusUI] Received: " << msg
-                                            << std::endl;
-
-                                  bool handledByMessageCallback = false;
-
-                                  // New Generic Message Handler
-                                  if (pImpl->messageCallback) {
-                                    pImpl->messageCallback(msg);
-                                    if (msg.find("\"kind\"") !=
-                                        std::string::npos) {
-                                      handledByMessageCallback = true;
-                                    }
-                                  }
-
-                                  // Parse JSON-RPC: {"id":"...",
-                                  // "method":"window.minimize", "params":[...]}
-                                  std::string id, method;
-                                  std::string result = "null";
-                                  bool success = false;
-
-                                  // Simple JSON parsing
-                                  auto getId = [&msg]() {
-                                    size_t pos = msg.find("\"id\"");
-                                    if (pos == std::string::npos)
-                                      return std::string();
-                                    pos = msg.find(":", pos);
-                                    if (pos == std::string::npos)
-                                      return std::string();
-                                    size_t start = msg.find("\"", pos);
-                                    if (start == std::string::npos)
-                                      return std::string();
-                                    size_t end = msg.find("\"", start + 1);
-                                    if (end == std::string::npos)
-                                      return std::string();
-                                    return msg.substr(start + 1,
-                                                      end - start - 1);
-                                  };
-                                  auto getMethod = [&msg]() {
-                                    size_t pos = msg.find("\"method\"");
-                                    if (pos == std::string::npos)
-                                      return std::string();
-                                    pos = msg.find(":", pos);
-                                    if (pos == std::string::npos)
-                                      return std::string();
-                                    size_t start = msg.find("\"", pos);
-                                    if (start == std::string::npos)
-                                      return std::string();
-                                    size_t end = msg.find("\"", start + 1);
-                                    if (end == std::string::npos)
-                                      return std::string();
-                                    return msg.substr(start + 1,
-                                                      end - start - 1);
-                                  };
-
-                                  id = getId();
-                                  method = getMethod();
-
-                                  auto extractFirstParam = [&msg]() {
-                                    size_t paramsPos = msg.find("\"params\"");
-                                    if (paramsPos == std::string::npos)
-                                      return std::string("null");
-                                    size_t colonPos = msg.find(":", paramsPos);
-                                    if (colonPos == std::string::npos)
-                                      return std::string("null");
-                                    size_t arrayStart = msg.find("[", colonPos);
-                                    if (arrayStart == std::string::npos)
-                                      return std::string("null");
-
-                                    size_t i = arrayStart + 1;
-                                    while (i < msg.size() &&
-                                           std::isspace(
-                                               static_cast<unsigned char>(msg[i])))
-                                      ++i;
-                                    if (i >= msg.size() || msg[i] == ']')
-                                      return std::string("null");
-
-                                    size_t start = i;
-                                    if (msg[i] == '"') {
-                                      ++i;
-                                      bool escaped = false;
-                                      while (i < msg.size()) {
-                                        char c = msg[i];
-                                        if (escaped) {
-                                          escaped = false;
-                                        } else if (c == '\\') {
-                                          escaped = true;
-                                        } else if (c == '"') {
-                                          ++i;
-                                          break;
-                                        }
-                                        ++i;
-                                      }
-                                      return msg.substr(start, i - start);
-                                    }
-
-                                    int depth = 0;
-                                    bool inString = false;
-                                    bool escaped = false;
-                                    while (i < msg.size()) {
-                                      char c = msg[i];
-                                      if (inString) {
-                                        if (escaped) {
-                                          escaped = false;
-                                        } else if (c == '\\') {
-                                          escaped = true;
-                                        } else if (c == '"') {
-                                          inString = false;
-                                        }
-                                      } else {
-                                        if (c == '"') {
-                                          inString = true;
-                                        } else if (c == '{' || c == '[') {
-                                          ++depth;
-                                        } else if (c == '}' || c == ']') {
-                                          if (depth == 0) {
-                                            break;
-                                          }
-                                          --depth;
-                                        } else if (c == ',' && depth == 0) {
-                                          break;
-                                        }
-                                      }
-                                      ++i;
-                                    }
-                                    return msg.substr(start, i - start);
-                                  };
-
-                                  auto decodeJsonString =
-                                      [](const std::string &input) {
-                                        if (input.size() < 2 ||
-                                            input.front() != '"' ||
-                                            input.back() != '"') {
-                                          return input;
-                                        }
-
-                                        std::string decoded;
-                                        decoded.reserve(input.size() - 2);
-                                        for (size_t i = 1; i + 1 < input.size();
-                                             ++i) {
-                                          char c = input[i];
-                                          if (c == '\\' && i + 1 < input.size() - 1) {
-                                            char next = input[++i];
-                                            switch (next) {
-                                            case '"':
-                                              decoded.push_back('"');
-                                              break;
-                                            case '\\':
-                                              decoded.push_back('\\');
-                                              break;
-                                            case '/':
-                                              decoded.push_back('/');
-                                              break;
-                                            case 'n':
-                                              decoded.push_back('\n');
-                                              break;
-                                            case 'r':
-                                              decoded.push_back('\r');
-                                              break;
-                                            case 't':
-                                              decoded.push_back('\t');
-                                              break;
-                                            default:
-                                              decoded.push_back(next);
-                                              break;
-                                            }
-                                          } else {
-                                            decoded.push_back(c);
-                                          }
-                                        }
-                                        return decoded;
-                                      };
-
-                                  // Route to handlers
-                                  if (handledByMessageCallback) {
-                                    success = true;
-                                    result = "null";
-                                  } else if (method.find("window.") == 0) {
-                                    std::string winMethod = method.substr(7);
-                                    if (winMethod == "minimize") {
-                                      if (pImpl->window)
-                                        pImpl->window->minimize();
-                                      success = true;
-                                    } else if (winMethod == "maximize") {
-                                      if (pImpl->window)
-                                        pImpl->window->maximize();
-                                      success = true;
-                                    } else if (winMethod == "restore") {
-                                      if (pImpl->window)
-                                        pImpl->window->restore();
-                                      success = true;
-                                    } else if (winMethod == "close") {
-                                      if (pImpl->window)
-                                        pImpl->window->close();
-                                      success = true;
-                                    } else if (winMethod == "show") {
-                                      if (pImpl->window)
-                                        pImpl->window->show();
-                                      success = true;
-                                    } else if (winMethod == "hide") {
-                                      if (pImpl->window)
-                                        pImpl->window->hide();
-                                      success = true;
-                                    } else if (winMethod == "getSize") {
-                                      if (pImpl->window) {
-                                        int w, h;
-                                        pImpl->window->getSize(w, h);
-                                        result =
-                                            "{\"width\":" + std::to_string(w) +
-                                            ",\"height\":" + std::to_string(h) +
-                                            "}";
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "getPosition") {
-                                      if (pImpl->window) {
-                                        int x, y;
-                                        pImpl->window->getPosition(x, y);
-                                        result = "{\"x\":" + std::to_string(x) +
-                                                 ",\"y\":" + std::to_string(y) +
-                                                 "}";
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setSize") {
-                                      // Parse params [width, height]
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        int w = 0, h = 0;
-                                        sscanf(params.c_str(), "%d, %d", &w,
-                                               &h);
-                                        if (pImpl->window)
-                                          pImpl->window->setSize(w, h);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setPosition") {
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        int x = 0, y = 0;
-                                        sscanf(params.c_str(), "%d, %d", &x,
-                                               &y);
-                                        if (pImpl->window)
-                                          pImpl->window->setPosition(x, y);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setTitle") {
-                                      size_t p1 = msg.find("[\"");
-                                      size_t p2 = msg.find("\"]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string title =
-                                            msg.substr(p1 + 2, p2 - p1 - 2);
-                                        if (pImpl->window)
-                                          pImpl->window->setTitle(title);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setFullscreen") {
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        if (pImpl->window)
-                                          pImpl->window->setFullscreen(
-                                              params.find("true") !=
-                                              std::string::npos);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setAlwaysOnTop") {
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        if (pImpl->window)
-                                          pImpl->window->setAlwaysOnTop(
-                                              params.find("true") !=
-                                              std::string::npos);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "setResizable") {
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        if (pImpl->window)
-                                          pImpl->window->setResizable(
-                                              params.find("true") !=
-                                              std::string::npos);
-                                      }
-                                      success = true;
-                                    } else if (winMethod == "isMaximized") {
-                                      result = (pImpl->window &&
-                                                pImpl->window->isMaximized())
-                                                   ? "true"
-                                                   : "false";
-                                      success = true;
-                                    } else if (winMethod == "isMinimized") {
-                                      result = (pImpl->window &&
-                                                pImpl->window->isMinimized())
-                                                   ? "true"
-                                                   : "false";
-                                      success = true;
-                                    } else if (winMethod == "isVisible") {
-                                      result = (pImpl->window &&
-                                                pImpl->window->isVisible())
-                                                   ? "true"
-                                                   : "false";
-                                      success = true;
-                                    } else if (winMethod == "center") {
-                                      if (pImpl->window)
-                                        pImpl->window->center();
-                                      success = true;
-                                    }
-                                  } else if (method.find("browser.") == 0) {
-                                    std::string browserMethod =
-                                        method.substr(8);
-                                    if (browserMethod == "navigate") {
-                                      size_t p1 = msg.find("[\"");
-                                      size_t p2 = msg.find("\"]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string url =
-                                            msg.substr(p1 + 2, p2 - p1 - 2);
-                                        pImpl->webview->Navigate(
-                                            std::wstring(url.begin(), url.end())
-                                                .c_str());
-                                      }
-                                      success = true;
-                                    } else if (browserMethod == "goBack") {
-                                      pImpl->webview->GoBack();
-                                      success = true;
-                                    } else if (browserMethod == "goForward") {
-                                      pImpl->webview->GoForward();
-                                      success = true;
-                                    } else if (browserMethod == "reload") {
-                                      pImpl->webview->Reload();
-                                      success = true;
-                                    } else if (browserMethod == "stop") {
-                                      pImpl->webview->Stop();
-                                      success = true;
-                                    } else if (browserMethod == "getUrl") {
-                                      result = "\"" + pImpl->currentURL + "\"";
-                                      success = true;
-                                    } else if (browserMethod == "getTitle") {
-                                      result =
-                                          "\"" + pImpl->currentTitle + "\"";
-                                      success = true;
-                                    } else if (browserMethod == "canGoBack") {
-                                      BOOL canBack;
-                                      pImpl->webview->get_CanGoBack(&canBack);
-                                      result = canBack ? "true" : "false";
-                                      success = true;
-                                    } else if (browserMethod ==
-                                               "canGoForward") {
-                                      BOOL canForward;
-                                      pImpl->webview->get_CanGoForward(
-                                          &canForward);
-                                      result = canForward ? "true" : "false";
-                                      success = true;
-                                    }
-                                  } else if (method.find("fileDrop.") == 0) {
-                                    std::string fileDropMethod =
-                                        method.substr(9);
-                                    if (fileDropMethod == "setEnabled") {
-                                      size_t p1 = msg.find("[");
-                                      size_t p2 = msg.find("]");
-                                      if (p1 != std::string::npos &&
-                                          p2 != std::string::npos) {
-                                        std::string params =
-                                            msg.substr(p1 + 1, p2 - p1 - 1);
-                                        bool enabled = params.find("true") !=
-                                                       std::string::npos;
-                                        pImpl->config.fileDrop = enabled;
-
-                                        HWND targetHwnd = nullptr;
-                                        if (pImpl->window) {
-                                          targetHwnd = static_cast<HWND>(
-                                              pImpl->window->nativeHandle());
-                                        }
-                                        if (!targetHwnd && pImpl->controller) {
-                                          pImpl->controller->get_ParentWindow(
-                                              &targetHwnd);
-                                        }
-                                        if (targetHwnd) {
-                                          DragAcceptFiles(targetHwnd,
-                                                          enabled ? TRUE
-                                                                  : FALSE);
-                                        }
-
-                                        // Always keep external drops allowed
-                                        // at the WebView2 level so WM_DROPFILES
-                                        // fires on the parent HWND
+                        // Set up WebMessageReceived handler for JS->C++ bridge
+                        pImpl->webview->add_WebMessageReceived(
+                            Callback<
+                                ICoreWebView2WebMessageReceivedEventHandler>(
+                                [pImpl](ICoreWebView2 *sender,
+                                        ICoreWebView2WebMessageReceivedEventArgs
+                                            *args) -> HRESULT {
+                                  (void)sender; // Suppress unused warning
+                                  LPWSTR message = nullptr;
+                                  args->TryGetWebMessageAsString(&message);
+                                  if (!message)
+                                    return S_OK;
+                                  std::wstring wmsg(message);
+#pragma warning(push)
+#pragma warning(disable : 4244) // Suppress wchar_t to char conversion warning
+                                  std::string msg(wmsg.begin(), wmsg.end());
+#pragma warning(pop)
+                                  CoTaskMemFree(message);
+
+                                  // Debug: log received message
+                                  std::cout << "[PlusUI] Received: " << msg
+                                            << std::endl;
+
+                                  bool handledByMessageCallback = false;
+
+                                  // New Generic Message Handler
+                                  if (pImpl->messageCallback) {
+                                    pImpl->messageCallback(msg);
+                                    if (msg.find("\"kind\"") !=
+                                        std::string::npos) {
+                                      handledByMessageCallback = true;
+                                    }
+                                  }
+
+                                  // Parse JSON-RPC: {"id":"...",
+                                  // "method":"window.minimize", "params":[...]}
+                                  std::string id, method;
+                                  std::string result = "null";
+                                  bool success = false;
+
+                                  // Handle plusui:fileDrop message from JS
+                                  if (msg.find("plusui:fileDrop") != std::string::npos) {
+                                    // Extract files from the message
+                                    size_t filesStart = msg.find("\"files\"");
+                                    if (filesStart != std::string::npos) {
+                                      size_t bracketStart = msg.find("[", filesStart);
+                                      size_t bracketEnd = msg.find("]", bracketStart);
+                                      if (bracketStart != std::string::npos && bracketEnd != std::string::npos) {
+                                        std::string filesJson = msg.substr(bracketStart, bracketEnd - bracketStart + 1);
+                                        
+                                        // Fire the global event in JS
+                                        std::string eventScript = 
+                                          "window.dispatchEvent(new CustomEvent('plusui:fileDrop.filesDropped', { detail: { files: " + filesJson + " } }));";
+                                        pImpl->webview->ExecuteScript(
+                                          std::wstring(eventScript.begin(), eventScript.end()).c_str(), nullptr);
+                                      }
+                                    }
+                                    success = true;
+                                  }
+
+                                  // Simple JSON parsing
+                                  auto getId = [&msg]() {
+                                    size_t pos = msg.find("\"id\"");
+                                    if (pos == std::string::npos)
+                                      return std::string();
+                                    pos = msg.find(":", pos);
+                                    if (pos == std::string::npos)
+                                      return std::string();
+                                    size_t start = msg.find("\"", pos);
+                                    if (start == std::string::npos)
+                                      return std::string();
+                                    size_t end = msg.find("\"", start + 1);
+                                    if (end == std::string::npos)
+                                      return std::string();
+                                    return msg.substr(start + 1,
+                                                      end - start - 1);
+                                  };
+                                  auto getMethod = [&msg]() {
+                                    size_t pos = msg.find("\"method\"");
+                                    if (pos == std::string::npos)
+                                      return std::string();
+                                    pos = msg.find(":", pos);
+                                    if (pos == std::string::npos)
+                                      return std::string();
+                                    size_t start = msg.find("\"", pos);
+                                    if (start == std::string::npos)
+                                      return std::string();
+                                    size_t end = msg.find("\"", start + 1);
+                                    if (end == std::string::npos)
+                                      return std::string();
+                                    return msg.substr(start + 1,
+                                                      end - start - 1);
+                                  };
+
+                                  id = getId();
+                                  method = getMethod();
+
+                                  auto extractFirstParam = [&msg]() {
+                                    size_t paramsPos = msg.find("\"params\"");
+                                    if (paramsPos == std::string::npos)
+                                      return std::string("null");
+                                    size_t colonPos = msg.find(":", paramsPos);
+                                    if (colonPos == std::string::npos)
+                                      return std::string("null");
+                                    size_t arrayStart = msg.find("[", colonPos);
+                                    if (arrayStart == std::string::npos)
+                                      return std::string("null");
+
+                                    size_t i = arrayStart + 1;
+                                    while (i < msg.size() &&
+                                           std::isspace(
+                                               static_cast<unsigned char>(msg[i])))
+                                      ++i;
+                                    if (i >= msg.size() || msg[i] == ']')
+                                      return std::string("null");
+
+                                    size_t start = i;
+                                    if (msg[i] == '"') {
+                                      ++i;
+                                      bool escaped = false;
+                                      while (i < msg.size()) {
+                                        char c = msg[i];
+                                        if (escaped) {
+                                          escaped = false;
+                                        } else if (c == '\\') {
+                                          escaped = true;
+                                        } else if (c == '"') {
+                                          ++i;
+                                          break;
+                                        }
+                                        ++i;
+                                      }
+                                      return msg.substr(start, i - start);
+                                    }
+
+                                    int depth = 0;
+                                    bool inString = false;
+                                    bool escaped = false;
+                                    while (i < msg.size()) {
+                                      char c = msg[i];
+                                      if (inString) {
+                                        if (escaped) {
+                                          escaped = false;
+                                        } else if (c == '\\') {
+                                          escaped = true;
+                                        } else if (c == '"') {
+                                          inString = false;
+                                        }
+                                      } else {
+                                        if (c == '"') {
+                                          inString = true;
+                                        } else if (c == '{' || c == '[') {
+                                          ++depth;
+                                        } else if (c == '}' || c == ']') {
+                                          if (depth == 0) {
+                                            break;
+                                          }
+                                          --depth;
+                                        } else if (c == ',' && depth == 0) {
+                                          break;
+                                        }
+                                      }
+                                      ++i;
+                                    }
+                                    return msg.substr(start, i - start);
+                                  };
+
+                                  auto decodeJsonString =
+                                      [](const std::string &input) {
+                                        if (input.size() < 2 ||
+                                            input.front() != '"' ||
+                                            input.back() != '"') {
+                                          return input;
+                                        }
+
+                                        std::string decoded;
+                                        decoded.reserve(input.size() - 2);
+                                        for (size_t i = 1; i + 1 < input.size();
+                                             ++i) {
+                                          char c = input[i];
+                                          if (c == '\\' && i + 1 < input.size() - 1) {
+                                            char next = input[++i];
+                                            switch (next) {
+                                            case '"':
+                                              decoded.push_back('"');
+                                              break;
+                                            case '\\':
+                                              decoded.push_back('\\');
+                                              break;
+                                            case '/':
+                                              decoded.push_back('/');
+                                              break;
+                                            case 'n':
+                                              decoded.push_back('\n');
+                                              break;
+                                            case 'r':
+                                              decoded.push_back('\r');
+                                              break;
+                                            case 't':
+                                              decoded.push_back('\t');
+                                              break;
+                                            default:
+                                              decoded.push_back(next);
+                                              break;
+                                            }
+                                          } else {
+                                            decoded.push_back(c);
+                                          }
+                                        }
+                                        return decoded;
+                                      };
+
+                                  // Route to handlers
+                                  if (handledByMessageCallback) {
+                                    success = true;
+                                    result = "null";
+                                  } else if (method.find("window.") == 0) {
+                                    std::string winMethod = method.substr(7);
+                                    if (winMethod == "minimize") {
+                                      if (pImpl->window)
+                                        pImpl->window->minimize();
+                                      success = true;
+                                    } else if (winMethod == "maximize") {
+                                      if (pImpl->window)
+                                        pImpl->window->maximize();
+                                      success = true;
+                                    } else if (winMethod == "restore") {
+                                      if (pImpl->window)
+                                        pImpl->window->restore();
+                                      success = true;
+                                    } else if (winMethod == "close") {
+                                      if (pImpl->window)
+                                        pImpl->window->close();
+                                      success = true;
+                                    } else if (winMethod == "show") {
+                                      if (pImpl->window)
+                                        pImpl->window->show();
+                                      success = true;
+                                    } else if (winMethod == "hide") {
+                                      if (pImpl->window)
+                                        pImpl->window->hide();
+                                      success = true;
+                                    } else if (winMethod == "getSize") {
+                                      if (pImpl->window) {
+                                        int w, h;
+                                        pImpl->window->getSize(w, h);
+                                        result =
+                                            "{\"width\":" + std::to_string(w) +
+                                            ",\"height\":" + std::to_string(h) +
+                                            "}";
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "getPosition") {
+                                      if (pImpl->window) {
+                                        int x, y;
+                                        pImpl->window->getPosition(x, y);
+                                        result = "{\"x\":" + std::to_string(x) +
+                                                 ",\"y\":" + std::to_string(y) +
+                                                 "}";
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setSize") {
+                                      // Parse params [width, height]
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        int w = 0, h = 0;
+                                        sscanf(params.c_str(), "%d, %d", &w,
+                                               &h);
+                                        if (pImpl->window)
+                                          pImpl->window->setSize(w, h);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setPosition") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        int x = 0, y = 0;
+                                        sscanf(params.c_str(), "%d, %d", &x,
+                                               &y);
+                                        if (pImpl->window)
+                                          pImpl->window->setPosition(x, y);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setTitle") {
+                                      size_t p1 = msg.find("[\"");
+                                      size_t p2 = msg.find("\"]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string title =
+                                            msg.substr(p1 + 2, p2 - p1 - 2);
+                                        if (pImpl->window)
+                                          pImpl->window->setTitle(title);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setFullscreen") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        if (pImpl->window)
+                                          pImpl->window->setFullscreen(
+                                              params.find("true") !=
+                                              std::string::npos);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setAlwaysOnTop") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        if (pImpl->window)
+                                          pImpl->window->setAlwaysOnTop(
+                                              params.find("true") !=
+                                              std::string::npos);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "setResizable") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        if (pImpl->window)
+                                          pImpl->window->setResizable(
+                                              params.find("true") !=
+                                              std::string::npos);
+                                      }
+                                      success = true;
+                                    } else if (winMethod == "isMaximized") {
+                                      result = (pImpl->window &&
+                                                pImpl->window->isMaximized())
+                                                   ? "true"
+                                                   : "false";
+                                      success = true;
+                                    } else if (winMethod == "isMinimized") {
+                                      result = (pImpl->window &&
+                                                pImpl->window->isMinimized())
+                                                   ? "true"
+                                                   : "false";
+                                      success = true;
+                                    } else if (winMethod == "isVisible") {
+                                      result = (pImpl->window &&
+                                                pImpl->window->isVisible())
+                                                   ? "true"
+                                                   : "false";
+                                      success = true;
+                                    } else if (winMethod == "center") {
+                                      if (pImpl->window)
+                                        pImpl->window->center();
+                                      success = true;
+                                    }
+                                  } else if (method.find("browser.") == 0) {
+                                    std::string browserMethod =
+                                        method.substr(8);
+                                    if (browserMethod == "navigate") {
+                                      size_t p1 = msg.find("[\"");
+                                      size_t p2 = msg.find("\"]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string url =
+                                            msg.substr(p1 + 2, p2 - p1 - 2);
+                                        pImpl->webview->Navigate(
+                                            std::wstring(url.begin(), url.end())
+                                                .c_str());
+                                      }
+                                      success = true;
+                                    } else if (browserMethod == "goBack") {
+                                      pImpl->webview->GoBack();
+                                      success = true;
+                                    } else if (browserMethod == "goForward") {
+                                      pImpl->webview->GoForward();
+                                      success = true;
+                                    } else if (browserMethod == "reload") {
+                                      pImpl->webview->Reload();
+                                      success = true;
+                                    } else if (browserMethod == "stop") {
+                                      pImpl->webview->Stop();
+                                      success = true;
+                                    } else if (browserMethod == "getUrl") {
+                                      result = "\"" + pImpl->currentURL + "\"";
+                                      success = true;
+                                    } else if (browserMethod == "getTitle") {
+                                      result =
+                                          "\"" + pImpl->currentTitle + "\"";
+                                      success = true;
+                                    } else if (browserMethod == "canGoBack") {
+                                      BOOL canBack;
+                                      pImpl->webview->get_CanGoBack(&canBack);
+                                      result = canBack ? "true" : "false";
+                                      success = true;
+                                    } else if (browserMethod ==
+                                               "canGoForward") {
+                                      BOOL canForward;
+                                      pImpl->webview->get_CanGoForward(
+                                          &canForward);
+                                      result = canForward ? "true" : "false";
+                                      success = true;
+                                    }
+                                  } else if (method.find("fileDrop.") == 0) {
+                                    std::string fileDropMethod =
+                                        method.substr(9);
+                                    if (fileDropMethod == "setEnabled") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        bool enabled = params.find("true") !=
+                                                       std::string::npos;
+                                        pImpl->config.fileDrop = enabled;
+
+                                        HWND targetHwnd = nullptr;
+                                        if (pImpl->window) {
+                                          targetHwnd = static_cast<HWND>(
+                                              pImpl->window->nativeHandle());
+                                        }
+                                        if (!targetHwnd && pImpl->controller) {
+                                          pImpl->controller->get_ParentWindow(
+                                              &targetHwnd);
+                                        }
+                                        if (targetHwnd) {
+                                          DragAcceptFiles(targetHwnd,
+                                                          enabled ? TRUE
+                                                                  : FALSE);
+                                        }
+
+                                        // Keep external drops DISABLED at WebView2 level
+                                        // so our IDropTarget on the parent HWND can intercept
+                                        // them and WM_DROPFILES never fires (which would
+                                        // cause double-handling). We handle everything
+                                        // in IDropTarget::Drop.
                                         if (pImpl->controller) {
                                           ComPtr<ICoreWebView2Controller4>
                                               controller4;
@@ -1669,115 +1663,115 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                                   &controller4)) &&
                                               controller4) {
                                             controller4->put_AllowExternalDrop(
-                                                TRUE);
+                                                FALSE);
                                           }
                                         }
-                                      }
-                                      success = true;
-                                    } else if (fileDropMethod == "isEnabled") {
-                                      result = pImpl->config.fileDrop
-                                                   ? "true"
-                                                   : "false";
-                                      success = true;
-                                    } else if (fileDropMethod == "startDrag") {
-                                      result = "false";
-                                      success = true;
-                                    } else if (fileDropMethod ==
-                                               "clearCallbacks") {
-                                      success = true;
-                                    }
-                                  } else if (method.find("webview.") == 0) {
-                                    std::string bindingName = method.substr(8);
-                                    auto bindingIt =
-                                        pImpl->bindings.find(bindingName);
-                                    if (bindingIt != pImpl->bindings.end()) {
-                                      std::string rawParam =
-                                          extractFirstParam();
-                                      std::string callbackArg =
-                                          decodeJsonString(rawParam);
-                                      try {
-                                        result =
-                                            bindingIt->second(callbackArg);
-                                        if (result.empty()) {
-                                          result = "null";
-                                        }
-                                        success = true;
-                                      } catch (const std::exception &e) {
-                                        std::cerr
-                                            << "[PlusUI] webview binding error: "
-                                            << e.what() << std::endl;
-                                        result = "null";
-                                        success = true;
-                                      }
-                                    }
-                                  }
-
-                                  // Send response back to JS (matches
-                                  // plusui-native-core SDK bridge)
-                                  std::string response =
-                                      "window.__response__(\"" + id + "\", " +
-                                      result + ");";
-                                  pImpl->webview->ExecuteScript(
-                                      std::wstring(response.begin(),
-                                                   response.end())
-                                          .c_str(),
-                                      nullptr);
-
-                                  return S_OK;
-                                })
-                                .Get(),
-                            nullptr);
-
-                        // Process pending scripts
-                        for (const auto &script : pImpl->pendingScripts) {
-                          pImpl->webview->ExecuteScript(
-                              std::wstring(script.begin(), script.end())
-                                  .c_str(),
-                              nullptr);
-                        }
-                        pImpl->pendingScripts.clear();
-
-                        // Process pending navigation
-                        if (!pImpl->pendingNavigation.empty()) {
-                          pImpl->webview->Navigate(
-                              std::wstring(pImpl->pendingNavigation.begin(),
-                                           pImpl->pendingNavigation.end())
-                                  .c_str());
-                          pImpl->pendingNavigation.clear();
-                        }
-
-                        // Process pending HTML
-                        if (!pImpl->pendingHTML.empty()) {
-                          pImpl->webview->NavigateToString(
-                              std::wstring(pImpl->pendingHTML.begin(),
-                                           pImpl->pendingHTML.end())
-                                  .c_str());
-                          pImpl->pendingHTML.clear();
-                        }
-
-                        // Process pending File
-                        if (!pImpl->pendingFile.empty()) {
-                          // For now, loadFile is implemented via navigate in
-                          // some versions or direct file reading. We'll handle
-                          // it via navigate for simplicity if it's already
-                          // implemented that way.
-                        }
-                      }
-                      return S_OK;
-                    })
-                    .Get());
-            return S_OK;
-          })
-          .Get());
-
-#elif defined(__APPLE__)
-  WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
-  config.preferences.javaScriptEnabled = YES;
-
-  if (win.pImpl->config.devtools) {
-    [config.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
-  }
-
+                                      }
+                                      success = true;
+                                    } else if (fileDropMethod == "isEnabled") {
+                                      result = pImpl->config.fileDrop
+                                                   ? "true"
+                                                   : "false";
+                                      success = true;
+                                    } else if (fileDropMethod == "startDrag") {
+                                      result = "false";
+                                      success = true;
+                                    } else if (fileDropMethod ==
+                                               "clearCallbacks") {
+                                      success = true;
+                                    }
+                                  } else if (method.find("webview.") == 0) {
+                                    std::string bindingName = method.substr(8);
+                                    auto bindingIt =
+                                        pImpl->bindings.find(bindingName);
+                                    if (bindingIt != pImpl->bindings.end()) {
+                                      std::string rawParam =
+                                          extractFirstParam();
+                                      std::string callbackArg =
+                                          decodeJsonString(rawParam);
+                                      try {
+                                        result =
+                                            bindingIt->second(callbackArg);
+                                        if (result.empty()) {
+                                          result = "null";
+                                        }
+                                        success = true;
+                                      } catch (const std::exception &e) {
+                                        std::cerr
+                                            << "[PlusUI] webview binding error: "
+                                            << e.what() << std::endl;
+                                        result = "null";
+                                        success = true;
+                                      }
+                                    }
+                                  }
+
+                                  // Send response back to JS (matches
+                                  // plusui-native-core SDK bridge)
+                                  std::string response =
+                                      "window.__response__(\"" + id + "\", " +
+                                      result + ");";
+                                  pImpl->webview->ExecuteScript(
+                                      std::wstring(response.begin(),
+                                                   response.end())
+                                          .c_str(),
+                                      nullptr);
+
+                                  return S_OK;
+                                })
+                                .Get(),
+                            nullptr);
+
+                        // Process pending scripts
+                        for (const auto &script : pImpl->pendingScripts) {
+                          pImpl->webview->ExecuteScript(
+                              std::wstring(script.begin(), script.end())
+                                  .c_str(),
+                              nullptr);
+                        }
+                        pImpl->pendingScripts.clear();
+
+                        // Process pending navigation
+                        if (!pImpl->pendingNavigation.empty()) {
+                          pImpl->webview->Navigate(
+                              std::wstring(pImpl->pendingNavigation.begin(),
+                                           pImpl->pendingNavigation.end())
+                                  .c_str());
+                          pImpl->pendingNavigation.clear();
+                        }
+
+                        // Process pending HTML
+                        if (!pImpl->pendingHTML.empty()) {
+                          pImpl->webview->NavigateToString(
+                              std::wstring(pImpl->pendingHTML.begin(),
+                                           pImpl->pendingHTML.end())
+                                  .c_str());
+                          pImpl->pendingHTML.clear();
+                        }
+
+                        // Process pending File
+                        if (!pImpl->pendingFile.empty()) {
+                          // For now, loadFile is implemented via navigate in
+                          // some versions or direct file reading. We'll handle
+                          // it via navigate for simplicity if it's already
+                          // implemented that way.
+                        }
+                      }
+                      return S_OK;
+                    })
+                    .Get());
+            return S_OK;
+          })
+          .Get());
+
+#elif defined(__APPLE__)
+  WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+  config.preferences.javaScriptEnabled = YES;
+
+  if (win.pImpl->config.devtools) {
+    [config.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
+  }
+
   // Block browser default drag-drop while allowing drop zone visual feedback.
   // File delivery is handled natively by macOS drag APIs, not browser events.
   if (win.pImpl->config.disableWebviewDragDrop ||
@@ -1835,24 +1829,24 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
         forMainFrameOnly:NO];
     [config.userContentController addUserScript:userScript];
   }
-
-  // Hide scrollbars if disabled
-  if (!win.pImpl->config.scrollbars) {
-    NSString *scrollbarScript =
-        [NSString stringWithUTF8String:kHideScrollbarsScript];
-
-    WKUserScript *scrollScript = [[WKUserScript alloc]
-          initWithSource:scrollbarScript
-           injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
-        forMainFrameOnly:NO];
-    [config.userContentController addUserScript:scrollScript];
-  }
-
-  NSView *parentView = (__bridge NSView *)windowHandle;
-  win.pImpl->wkWebView =
-      [[WKWebView alloc] initWithFrame:parentView.bounds configuration:config];
-  [parentView addSubview:win.pImpl->wkWebView];
-
+
+  // Hide scrollbars if disabled
+  if (!win.pImpl->config.scrollbars) {
+    NSString *scrollbarScript =
+        [NSString stringWithUTF8String:kHideScrollbarsScript];
+
+    WKUserScript *scrollScript = [[WKUserScript alloc]
+          initWithSource:scrollbarScript
+           injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
+        forMainFrameOnly:NO];
+    [config.userContentController addUserScript:scrollScript];
+  }
+
+  NSView *parentView = (__bridge NSView *)windowHandle;
+  win.pImpl->wkWebView =
+      [[WKWebView alloc] initWithFrame:parentView.bounds configuration:config];
+  [parentView addSubview:win.pImpl->wkWebView];
+
   win.pImpl->nativeWebView = (__bridge void *)win.pImpl->wkWebView;
 
   // ── macOS key event forwarding ─────────────────────────────────────────────
@@ -1935,8 +1929,20 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
   // ── Linux / GTK + WebKit2 WebView ─────────────────────────────────────────
   {
     GtkWidget *gtkParent = static_cast<GtkWidget*>(windowHandle);
+
+    // Disable GPU hardware acceleration — GBM/DRM buffer creation fails under
+    // XWayland. Software rendering works everywhere and is fine for a UI webview.
+    WebKitSettings *wkSettings = webkit_settings_new();
+    webkit_settings_set_hardware_acceleration_policy(
+        wkSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
+    if (win.pImpl->config.devtools) {
+      webkit_settings_set_enable_developer_extras(wkSettings, TRUE);
+    }
+
     WebKitWebView *webView =
-        WEBKIT_WEB_VIEW(webkit_web_view_new());
+        WEBKIT_WEB_VIEW(webkit_web_view_new_with_settings(wkSettings));
+    g_object_unref(wkSettings);
+
     gtk_container_add(GTK_CONTAINER(gtkParent), GTK_WIDGET(webView));
     gtk_widget_show(GTK_WIDGET(webView));
     win.pImpl->gtkWebView = webView;
@@ -1955,12 +1961,260 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
     webkit_user_content_manager_add_script(mgr, bridgeScript);
     webkit_user_script_unref(bridgeScript);
 
+    // Register "plusui" as a named message handler so the JS bridge above works.
+    webkit_user_content_manager_register_script_message_handler(mgr, "plusui");
+
     // Helper to run JS in this WebView
     auto runJS = [webView](const std::string& script) {
       webkit_web_view_run_javascript(webView, script.c_str(),
                                      nullptr, nullptr, nullptr);
     };
 
+    // ── JS → C++ message dispatch ─────────────────────────────────────────────
+    // Mirror the full Windows dispatch so every plusui.window.*, app.*, etc.
+    // call from the frontend reaches the correct C++ handler.
+    struct MsgCtx {
+      WebKitWebView *webView;
+      Window::Impl  *impl;
+    };
+    auto *msgCtx = new MsgCtx{webView, win.pImpl.get()};
+
+    // Assign to a typed pointer so G_CALLBACK receives a single token (not a
+    // multi-line lambda — the preprocessor would split on commas otherwise).
+    static auto sMsgHandler = +[](WebKitUserContentManager *,
+                                   WebKitJavascriptResult *jsResult,
+                                   gpointer data) -> void {
+        auto *ctx = static_cast<MsgCtx *>(data);
+        Window::Impl *pImpl = ctx->impl;
+
+        JSCValue *jsVal = webkit_javascript_result_get_js_value(jsResult);
+        gchar *raw = jsc_value_to_string(jsVal);
+        if (!raw) return;
+        std::string msg(raw);
+        g_free(raw);
+
+        auto runJSResp = [ctx](const std::string &script) {
+          webkit_web_view_run_javascript(ctx->webView, script.c_str(),
+                                         nullptr, nullptr, nullptr);
+        };
+
+        // ── simple JSON field extractors (no external dep) ───────────────────
+        auto getField = [&](const std::string &key) -> std::string {
+          size_t pos = msg.find("\"" + key + "\"");
+          if (pos == std::string::npos) return {};
+          pos = msg.find(':', pos); if (pos == std::string::npos) return {};
+          ++pos;
+          while (pos < msg.size() && std::isspace((unsigned char)msg[pos])) ++pos;
+          if (pos >= msg.size()) return {};
+          if (msg[pos] == '"') {
+            size_t s = pos + 1, e = s;
+            while (e < msg.size() && msg[e] != '"') {
+              if (msg[e] == '\\') ++e;
+              ++e;
+            }
+            return msg.substr(s, e - s);
+          }
+          size_t s = pos;
+          while (pos < msg.size() && msg[pos] != ',' && msg[pos] != '}') ++pos;
+          return msg.substr(s, pos - s);
+        };
+
+        auto extractFirstParam = [&]() -> std::string {
+          size_t pa = msg.find("\"params\"");
+          if (pa == std::string::npos) return "null";
+          size_t ar = msg.find('[', pa);
+          if (ar == std::string::npos) return "null";
+          size_t i = ar + 1;
+          while (i < msg.size() && std::isspace((unsigned char)msg[i])) ++i;
+          if (i >= msg.size() || msg[i] == ']') return "null";
+          size_t start = i;
+          if (msg[i] == '"') {
+            ++i;
+            while (i < msg.size()) {
+              if (msg[i] == '\\') { ++i; } else if (msg[i] == '"') { ++i; break; }
+              ++i;
+            }
+            return msg.substr(start, i - start);
+          }
+          int depth = 0;
+          bool inStr = false, esc = false;
+          while (i < msg.size()) {
+            char c = msg[i];
+            if (inStr) { if (esc) esc=false; else if (c=='\\') esc=true; else if (c=='"') inStr=false; }
+            else {
+              if (c=='"') inStr=true;
+              else if (c=='{' || c=='[') ++depth;
+              else if ((c=='}' || c==']') && depth==0) break;
+              else if (c==',' && depth==0) break;
+              else if (c=='}' || c==']') --depth;
+            }
+            ++i;
+          }
+          return msg.substr(start, i - start);
+        };
+
+        auto decodeStr = [](const std::string &s) -> std::string {
+          if (s.size() < 2 || s.front() != '"' || s.back() != '"') return s;
+          std::string out; out.reserve(s.size()-2);
+          for (size_t i = 1; i+1 < s.size(); ++i) {
+            if (s[i]=='\\' && i+2 < s.size()) {
+              char n = s[++i];
+              switch(n){ case '"': out+='"'; break; case '\\': out+='\\'; break;
+                         case 'n': out+='\n'; break; case 'r': out+='\r'; break;
+                         case 't': out+='\t'; break; default: out+=n; break; }
+            } else { out += s[i]; }
+          }
+          return out;
+        };
+
+        std::string id     = getField("id");
+        std::string method = getField("method");
+        std::string result = "null";
+        bool success = false;
+
+        // ── messageCallback (user-level handler) ──────────────────────────────
+        if (pImpl->messageCallback) {
+          pImpl->messageCallback(msg);
+          if (msg.find("\"kind\"") != std::string::npos) {
+            success = true;
+          }
+        }
+
+        // ── window.* ──────────────────────────────────────────────────────────
+        if (!success && method.rfind("window.", 0) == 0) {
+          std::string wm = method.substr(7);
+          success = true;
+          if      (wm == "minimize")   { if (pImpl->window) pImpl->window->minimize(); }
+          else if (wm == "maximize")   { if (pImpl->window) pImpl->window->maximize(); }
+          else if (wm == "restore")    { if (pImpl->window) pImpl->window->restore(); }
+          else if (wm == "close")      { if (pImpl->window) pImpl->window->close(); }
+          else if (wm == "show")       { if (pImpl->window) pImpl->window->show();
+                                         else { pImpl->state.isHidden=false; pImpl->state.isVisible=true; } }
+          else if (wm == "hide")       { if (pImpl->window) pImpl->window->hide();
+                                         else { pImpl->state.isHidden=true; pImpl->state.isVisible=false; } }
+          else if (wm == "center")     { if (pImpl->window) pImpl->window->center(); }
+          else if (wm == "getSize") {
+            int w=0,h=0; if (pImpl->window) pImpl->window->getSize(w,h);
+            result = "{\"width\":" + std::to_string(w) + ",\"height\":" + std::to_string(h) + "}";
+          }
+          else if (wm == "getPosition") {
+            int x=0,y=0; if (pImpl->window) pImpl->window->getPosition(x,y);
+            result = "{\"x\":" + std::to_string(x) + ",\"y\":" + std::to_string(y) + "}";
+          }
+          else if (wm == "setSize") {
+            size_t p1=msg.find('['), p2=msg.find(']');
+            if (p1!=std::string::npos && p2!=std::string::npos) {
+              int w=0,h=0; sscanf(msg.substr(p1+1,p2-p1-1).c_str(),"%d, %d",&w,&h);
+              if (pImpl->window) pImpl->window->setSize(w,h);
+            }
+          }
+          else if (wm == "setPosition") {
+            size_t p1=msg.find('['), p2=msg.find(']');
+            if (p1!=std::string::npos && p2!=std::string::npos) {
+              int x=0,y=0; sscanf(msg.substr(p1+1,p2-p1-1).c_str(),"%d, %d",&x,&y);
+              if (pImpl->window) pImpl->window->setPosition(x,y);
+            }
+          }
+          else if (wm == "setTitle") {
+            size_t p1=msg.find("[\""), p2=msg.find("\"]");
+            if (p1!=std::string::npos && p2!=std::string::npos) {
+              if (pImpl->window) pImpl->window->setTitle(msg.substr(p1+2,p2-p1-2));
+            }
+          }
+          else if (wm == "setFullscreen") {
+            size_t p1=msg.find('['), p2=msg.find(']');
+            if (p1!=std::string::npos && p2!=std::string::npos)
+              if (pImpl->window) pImpl->window->setFullscreen(msg.find("true",p1)!=std::string::npos && msg.find("true",p1)<p2);
+          }
+          else if (wm == "setAlwaysOnTop") {
+            size_t p1=msg.find('['), p2=msg.find(']');
+            if (p1!=std::string::npos && p2!=std::string::npos)
+              if (pImpl->window) pImpl->window->setAlwaysOnTop(msg.find("true",p1)!=std::string::npos && msg.find("true",p1)<p2);
+          }
+          else if (wm == "setResizable") {
+            size_t p1=msg.find('['), p2=msg.find(']');
+            if (p1!=std::string::npos && p2!=std::string::npos)
+              if (pImpl->window) pImpl->window->setResizable(msg.find("true",p1)!=std::string::npos && msg.find("true",p1)<p2);
+          }
+          else if (wm == "isMaximized") { result = (pImpl->window && pImpl->window->isMaximized()) ? "true":"false"; }
+          else if (wm == "isMinimized") { result = (pImpl->window && pImpl->window->isMinimized()) ? "true":"false"; }
+          else if (wm == "isVisible")   { result = (pImpl->window && pImpl->window->isVisible())   ? "true":"false"; }
+          else { success = false; }
+        }
+
+        // ── browser.* ─────────────────────────────────────────────────────────
+        if (!success && method.rfind("browser.", 0) == 0) {
+          std::string bm = method.substr(8); success = true;
+          if      (bm == "navigate") {
+            size_t p1=msg.find("[\""), p2=msg.find("\"]");
+            if (p1!=std::string::npos && p2!=std::string::npos)
+              webkit_web_view_load_uri(ctx->webView, msg.substr(p1+2,p2-p1-2).c_str());
+          }
+          else if (bm == "goBack")    { webkit_web_view_go_back(ctx->webView); }
+          else if (bm == "goForward") { webkit_web_view_go_forward(ctx->webView); }
+          else if (bm == "reload")    { webkit_web_view_reload(ctx->webView); }
+          else if (bm == "stop")      { webkit_web_view_stop_loading(ctx->webView); }
+          else if (bm == "getUrl")    { result = "\"" + pImpl->currentURL + "\""; }
+          else if (bm == "getTitle")  { result = "\"" + pImpl->currentTitle + "\""; }
+          else if (bm == "canGoBack")    { result = webkit_web_view_can_go_back(ctx->webView) ? "true":"false"; }
+          else if (bm == "canGoForward") { result = webkit_web_view_can_go_forward(ctx->webView) ? "true":"false"; }
+          else { success = false; }
+        }
+
+        // ── app.* ─────────────────────────────────────────────────────────────
+        if (!success && method.rfind("app.", 0) == 0) {
+          std::string am = method.substr(4); success = true;
+          if (am == "quit") { gtk_main_quit(); }
+          else { success = false; }
+        }
+
+        // ── fileDrop.* ────────────────────────────────────────────────────────
+        if (!success && method.rfind("fileDrop.", 0) == 0) {
+          std::string fm = method.substr(9); success = true;
+          if      (fm == "setEnabled") { size_t p1=msg.find('['),p2=msg.find(']');
+                                          if(p1!=std::string::npos&&p2!=std::string::npos)
+                                            pImpl->config.fileDrop = msg.find("true",p1)!=std::string::npos&&msg.find("true",p1)<p2; }
+          else if (fm == "isEnabled")  { result = pImpl->config.fileDrop ? "true":"false"; }
+          else if (fm == "startDrag" || fm == "clearCallbacks") { /* no-op on Linux */ }
+          else { success = false; }
+        }
+
+        // ── webview.* (custom C++ bindings) ───────────────────────────────────
+        if (!success && method.rfind("webview.", 0) == 0) {
+          std::string bn = method.substr(8);
+          auto it = pImpl->bindings.find(bn);
+          if (it != pImpl->bindings.end()) {
+            try {
+              result = it->second(decodeStr(extractFirstParam()));
+              if (result.empty()) result = "null";
+              success = true;
+            } catch (...) { result = "null"; success = true; }
+          }
+        }
+
+        // ── connect.* (custom semantic bindings via bindConnect) ──────────────
+        if (!success && method.rfind("connect.", 0) == 0) {
+          std::string bn = method.substr(8);
+          auto it = pImpl->bindings.find("connect." + bn);
+          if (it == pImpl->bindings.end()) it = pImpl->bindings.find(bn);
+          if (it != pImpl->bindings.end()) {
+            try {
+              result = it->second(decodeStr(extractFirstParam()));
+              if (result.empty()) result = "null";
+              success = true;
+            } catch (...) { result = "null"; success = true; }
+          }
+        }
+
+        // ── send response back to JS ──────────────────────────────────────────
+        if (!id.empty()) {
+          std::string resp = "window.__response__(\"" + id + "\", " + result + ");";
+          runJSResp(resp);
+        }
+    };
+    g_signal_connect(mgr, "script-message-received::plusui",
+                     G_CALLBACK(sMsgHandler), msgCtx);
+
     // GDK keyval → PlusUI KeyCode
     auto gdkKeyToPlusUI = [](guint keyval) -> int {
       if (keyval >= GDK_KEY_a && keyval <= GDK_KEY_z)
@@ -2102,423 +2356,423 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
 
   return win;
 }
-
-TrayManager &Window::tray() { return *pImpl->trayManager; }
-
-void Window::setWindow(std::shared_ptr<Window> win) {
-  pImpl->window = win;
-  if (!win)
-    return;
-
-  std::weak_ptr<Impl> weak_pImpl = pImpl;
-  win->onResize([weak_pImpl](int w, int h) {
-    if (auto pImpl = weak_pImpl.lock()) {
-#ifdef _WIN32
-      if (pImpl->controller) {
-        RECT bounds = {0, 0, w, h};
-        pImpl->controller->put_Bounds(bounds);
-      }
-#elif defined(__APPLE__)
-      if (pImpl->wkWebView) {
-        NSView *view = (__bridge NSView *)pImpl->wkWebView;
-        NSView *parent = [view superview];
-        if (parent) {
-          [view setFrame:[parent bounds]];
-        }
-      }
-#else
-      if (pImpl->gtkWebView) {
-        // GTK usually handles this if added to a container with expand=TRUE
-        // but we can ensure it here if it's a fixed layout parent
-        gtk_widget_set_size_request(GTK_WIDGET(pImpl->gtkWebView), w, h);
-      }
-#endif
-    }
-  });
-
-  // Trigger initial resize
-  int w, h;
-  win->getSize(w, h);
-#ifdef _WIN32
-  if (pImpl->controller) {
-    RECT bounds = {0, 0, w, h};
-    pImpl->controller->put_Bounds(bounds);
-  }
-#endif
-}
-
-void Window::navigate(const std::string &url) {
-  pImpl->currentURL = url;
-  pImpl->loading = true;
-
-#ifdef _WIN32
-  if (pImpl->ready && pImpl->webview) {
-    pImpl->webview->Navigate(std::wstring(url.begin(), url.end()).c_str());
-  } else {
-    pImpl->pendingNavigation = url;
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    NSURL *nsurl =
-        [NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]];
-    NSURLRequest *request = [NSURLRequest requestWithURL:nsurl];
-    [pImpl->wkWebView loadRequest:request];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_load_uri(pImpl->gtkWebView, url.c_str());
-  }
-#endif
-}
-
-void Window::onMessage(MessageCallback callback) {
-  pImpl->messageCallback = callback;
-}
-
-void Window::postMessage(const std::string &message) {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    std::wstring wmsg(message.begin(), message.end());
-    pImpl->webview->PostWebMessageAsJson(wmsg.c_str());
-  }
-#elif defined(__APPLE__)
-  // TODO: formatting for Apple
-#endif
-}
-
-void Window::onFileDrop(FileDropCallback callback) {
-  pImpl->fileDropCallback = callback;
-}
-
-void Window::bind(const std::string &name, JSCallback callback) {
-  pImpl->bindings[name] = callback;
-
-  std::string bridgeScript =
-      "window." + name +
-      R"( = function(...args) {
-  if (window.plusui && typeof window.plusui.invoke === 'function') {
-    const payload = args.length === 0 ? null : (args.length === 1 ? args[0] : args);
-    return window.plusui.invoke('webview.)" +
-      name +
-      R"(', [payload]);
-  }
-  if (window.__invoke__) {
-    const payload = args.length === 0 ? null : (args.length === 1 ? args[0] : args);
-    return window.__invoke__('webview.)" +
-      name +
-      R"(', [payload]);
-  }
-  return Promise.resolve(null);
-};)";
-
-  executeScript(bridgeScript);
-}
-
-void Window::unbind(const std::string &name) {
-  pImpl->bindings.erase(name);
-  executeScript("delete window." + name + ";");
-}
-
-void Window::loadURL(const std::string &url) { navigate(url); }
-
-void Window::loadHTML(const std::string &html) {
-  loadHTML(html, "about:blank");
-}
-
-void Window::loadHTML(const std::string &html, const std::string &baseURL) {
-  pImpl->loading = true;
-
-#ifdef _WIN32
-  (void)baseURL; // Not used on Windows
-  if (pImpl->ready && pImpl->webview) {
-    pImpl->webview->NavigateToString(
-        std::wstring(html.begin(), html.end()).c_str());
-  } else {
-    pImpl->pendingHTML = html;
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    NSString *htmlString = [NSString stringWithUTF8String:html.c_str()];
-    NSURL *base =
-        [NSURL URLWithString:[NSString stringWithUTF8String:baseURL.c_str()]];
-    [pImpl->wkWebView loadHTMLString:htmlString baseURL:base];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_load_html(pImpl->gtkWebView, html.c_str(), baseURL.c_str());
-  }
-#endif
-}
-
-void Window::loadFile(const std::string &filePath) {
-  std::ifstream file(filePath);
-  if (!file) {
-    std::cerr << "PlusUI: Failed to open file: " << filePath << std::endl;
-    return;
-  }
-
-  std::stringstream buffer;
-  buffer << file.rdbuf();
-
-  // Use file:// URL as base for relative paths
-  std::string baseURL =
-      "file://" + filePath.substr(0, filePath.find_last_of("/\\") + 1);
-  loadHTML(buffer.str(), baseURL);
-}
-
-void Window::reload() {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->Reload();
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView reload];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_reload(pImpl->gtkWebView);
-  }
-#endif
-}
-
-void Window::stop() {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->Stop();
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView stopLoading];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_stop_loading(pImpl->gtkWebView);
-  }
-#endif
-}
-
-void Window::goBack() {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->GoBack();
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView goBack];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_go_back(pImpl->gtkWebView);
-  }
-#endif
-}
-
-void Window::goForward() {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->GoForward();
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView goForward];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_go_forward(pImpl->gtkWebView);
-  }
-#endif
-}
-
-bool Window::canGoBack() const {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    BOOL canGoBack;
-    pImpl->webview->get_CanGoBack(&canGoBack);
-    return canGoBack;
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    return [pImpl->wkWebView canGoBack];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    return webkit_web_view_can_go_back(pImpl->gtkWebView);
-  }
-#endif
-  return false;
-}
-
-bool Window::canGoForward() const {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    BOOL canGoForward;
-    pImpl->webview->get_CanGoForward(&canGoForward);
-    return canGoForward;
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    return [pImpl->wkWebView canGoForward];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    return webkit_web_view_can_go_forward(pImpl->gtkWebView);
-  }
-#endif
-  return false;
-}
-
-void Window::executeScript(const std::string &script) {
-#ifdef _WIN32
-  if (pImpl->ready && pImpl->webview) {
-    pImpl->webview->ExecuteScript(
-        std::wstring(script.begin(), script.end()).c_str(), nullptr);
-  } else {
-    pImpl->pendingScripts.push_back(script);
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    NSString *js = [NSString stringWithUTF8String:script.c_str()];
-    [pImpl->wkWebView evaluateJavaScript:js completionHandler:nil];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_run_javascript(pImpl->gtkWebView, script.c_str(), nullptr,
-                                   nullptr, nullptr);
-  }
-#endif
-}
-
-void Window::executeScript(const std::string &script,
-                           std::function<void(const std::string &)> callback) {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->ExecuteScript(
-        std::wstring(script.begin(), script.end()).c_str(),
-        Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
-            [callback](HRESULT error, LPCWSTR result) -> HRESULT {
-              (void)error; // Suppress unused warning
-              if (result && callback) {
-                std::wstring wstr(result);
-                callback(std::string(wstr.begin(), wstr.end()));
-              }
-              return S_OK;
-            })
-            .Get());
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    NSString *js = [NSString stringWithUTF8String:script.c_str()];
-    [pImpl->wkWebView evaluateJavaScript:js
-                       completionHandler:^(id result, NSError *error) {
-                         if (result && callback) {
-                           NSString *resultStr =
-                               [NSString stringWithFormat:@"%@", result];
-                           callback([resultStr UTF8String]);
-                         }
-                       }];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    // GTK WebKit callback handling would go here
-    webkit_web_view_run_javascript(pImpl->gtkWebView, script.c_str(), nullptr,
-                                   nullptr, nullptr);
-  }
-#endif
-}
-
-void Window::openDevTools() {
-#ifdef _WIN32
-  if (pImpl->webview) {
-    pImpl->webview->OpenDevToolsWindow();
-  }
-#elif defined(__APPLE__)
-  // macOS: Dev tools open in Safari's Web Inspector
-#else
-  if (pImpl->gtkWebView) {
-    WebKitWebInspector *inspector =
-        webkit_web_view_get_inspector(pImpl->gtkWebView);
-    webkit_web_inspector_show(inspector);
-  }
-#endif
-}
-
-void Window::closeDevTools() {
-#ifdef _WIN32
-  // WebView2 doesn't have explicit close
-#elif defined(__APPLE__)
-  // macOS: Handled by Web Inspector
-#else
-  if (pImpl->gtkWebView) {
-    WebKitWebInspector *inspector =
-        webkit_web_view_get_inspector(pImpl->gtkWebView);
-    webkit_web_inspector_close(inspector);
-  }
-#endif
-}
-
-void Window::setUserAgent(const std::string &userAgent) {
-  pImpl->userAgent = userAgent;
-
-#ifdef _WIN32
-  if (pImpl->webview) {
-    ComPtr<ICoreWebView2Settings> settings;
-    pImpl->webview->get_Settings(&settings);
-    // WebView2 user agent requires settings2 interface
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView
-        setCustomUserAgent:[NSString stringWithUTF8String:userAgent.c_str()]];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    WebKitSettings *settings = webkit_web_view_get_settings(pImpl->gtkWebView);
-    webkit_settings_set_user_agent(settings, userAgent.c_str());
-  }
-#endif
-}
-
-std::string Window::getUserAgent() const { return pImpl->userAgent; }
-
-void Window::setZoom(double factor) {
-  pImpl->zoom = factor;
-
-#ifdef _WIN32
-  if (pImpl->controller) {
-    pImpl->controller->put_ZoomFactor(factor);
-  }
-#elif defined(__APPLE__)
-  if (pImpl->wkWebView) {
-    [pImpl->wkWebView setPageZoom:factor];
-  }
-#else
-  if (pImpl->gtkWebView) {
-    webkit_web_view_set_zoom_level(pImpl->gtkWebView, factor);
-  }
-#endif
-}
-
-double Window::getZoom() const { return pImpl->zoom; }
-
-void Window::injectCSS(const std::string &css) {
-  std::string script = R"(
-        (function() {
-            const style = document.createElement('style');
-            style.id = 'plusui-injected-css-' + Date.now();
-            style.textContent = `)" +
-                       css + R"(`;
-            if (document.head) {
-              document.head.appendChild(style);
-            } else {
-              document.documentElement.appendChild(style);
-            }
-        })();
-    )";
-
-  executeScript(script);
-}
-
+
+TrayManager &Window::tray() { return *pImpl->trayManager; }
+
+void Window::setWindow(std::shared_ptr<Window> win) {
+  pImpl->window = win;
+  if (!win)
+    return;
+
+  std::weak_ptr<Impl> weak_pImpl = pImpl;
+  win->onResize([weak_pImpl](int w, int h) {
+    if (auto pImpl = weak_pImpl.lock()) {
+#ifdef _WIN32
+      if (pImpl->controller) {
+        RECT bounds = {0, 0, w, h};
+        pImpl->controller->put_Bounds(bounds);
+      }
+#elif defined(__APPLE__)
+      if (pImpl->wkWebView) {
+        NSView *view = (__bridge NSView *)pImpl->wkWebView;
+        NSView *parent = [view superview];
+        if (parent) {
+          [view setFrame:[parent bounds]];
+        }
+      }
+#else
+      if (pImpl->gtkWebView) {
+        // GTK usually handles this if added to a container with expand=TRUE
+        // but we can ensure it here if it's a fixed layout parent
+        gtk_widget_set_size_request(GTK_WIDGET(pImpl->gtkWebView), w, h);
+      }
+#endif
+    }
+  });
+
+  // Trigger initial resize
+  int w, h;
+  win->getSize(w, h);
+#ifdef _WIN32
+  if (pImpl->controller) {
+    RECT bounds = {0, 0, w, h};
+    pImpl->controller->put_Bounds(bounds);
+  }
+#endif
+}
+
+void Window::navigate(const std::string &url) {
+  pImpl->currentURL = url;
+  pImpl->loading = true;
+
+#ifdef _WIN32
+  if (pImpl->ready && pImpl->webview) {
+    pImpl->webview->Navigate(std::wstring(url.begin(), url.end()).c_str());
+  } else {
+    pImpl->pendingNavigation = url;
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    NSURL *nsurl =
+        [NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]];
+    NSURLRequest *request = [NSURLRequest requestWithURL:nsurl];
+    [pImpl->wkWebView loadRequest:request];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_load_uri(pImpl->gtkWebView, url.c_str());
+  }
+#endif
+}
+
+void Window::onMessage(MessageCallback callback) {
+  pImpl->messageCallback = callback;
+}
+
+void Window::postMessage(const std::string &message) {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    std::wstring wmsg(message.begin(), message.end());
+    pImpl->webview->PostWebMessageAsJson(wmsg.c_str());
+  }
+#elif defined(__APPLE__)
+  // TODO: formatting for Apple
+#endif
+}
+
+void Window::onFileDrop(FileDropCallback callback) {
+  pImpl->fileDropCallback = callback;
+}
+
+void Window::bind(const std::string &name, JSCallback callback) {
+  pImpl->bindings[name] = callback;
+
+  std::string bridgeScript =
+      "window." + name +
+      R"( = function(...args) {
+  if (window.plusui && typeof window.plusui.invoke === 'function') {
+    const payload = args.length === 0 ? null : (args.length === 1 ? args[0] : args);
+    return window.plusui.invoke('webview.)" +
+      name +
+      R"(', [payload]);
+  }
+  if (window.__invoke__) {
+    const payload = args.length === 0 ? null : (args.length === 1 ? args[0] : args);
+    return window.__invoke__('webview.)" +
+      name +
+      R"(', [payload]);
+  }
+  return Promise.resolve(null);
+};)";
+
+  executeScript(bridgeScript);
+}
+
+void Window::unbind(const std::string &name) {
+  pImpl->bindings.erase(name);
+  executeScript("delete window." + name + ";");
+}
+
+void Window::loadURL(const std::string &url) { navigate(url); }
+
+void Window::loadHTML(const std::string &html) {
+  loadHTML(html, "about:blank");
+}
+
+void Window::loadHTML(const std::string &html, const std::string &baseURL) {
+  pImpl->loading = true;
+
+#ifdef _WIN32
+  (void)baseURL; // Not used on Windows
+  if (pImpl->ready && pImpl->webview) {
+    pImpl->webview->NavigateToString(
+        std::wstring(html.begin(), html.end()).c_str());
+  } else {
+    pImpl->pendingHTML = html;
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    NSString *htmlString = [NSString stringWithUTF8String:html.c_str()];
+    NSURL *base =
+        [NSURL URLWithString:[NSString stringWithUTF8String:baseURL.c_str()]];
+    [pImpl->wkWebView loadHTMLString:htmlString baseURL:base];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_load_html(pImpl->gtkWebView, html.c_str(), baseURL.c_str());
+  }
+#endif
+}
+
+void Window::loadFile(const std::string &filePath) {
+  std::ifstream file(filePath);
+  if (!file) {
+    std::cerr << "PlusUI: Failed to open file: " << filePath << std::endl;
+    return;
+  }
+
+  std::stringstream buffer;
+  buffer << file.rdbuf();
+
+  // Use file:// URL as base for relative paths
+  std::string baseURL =
+      "file://" + filePath.substr(0, filePath.find_last_of("/\\") + 1);
+  loadHTML(buffer.str(), baseURL);
+}
+
+void Window::reload() {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->Reload();
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView reload];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_reload(pImpl->gtkWebView);
+  }
+#endif
+}
+
+void Window::stop() {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->Stop();
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView stopLoading];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_stop_loading(pImpl->gtkWebView);
+  }
+#endif
+}
+
+void Window::goBack() {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->GoBack();
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView goBack];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_go_back(pImpl->gtkWebView);
+  }
+#endif
+}
+
+void Window::goForward() {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->GoForward();
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView goForward];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_go_forward(pImpl->gtkWebView);
+  }
+#endif
+}
+
+bool Window::canGoBack() const {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    BOOL canGoBack;
+    pImpl->webview->get_CanGoBack(&canGoBack);
+    return canGoBack;
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    return [pImpl->wkWebView canGoBack];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    return webkit_web_view_can_go_back(pImpl->gtkWebView);
+  }
+#endif
+  return false;
+}
+
+bool Window::canGoForward() const {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    BOOL canGoForward;
+    pImpl->webview->get_CanGoForward(&canGoForward);
+    return canGoForward;
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    return [pImpl->wkWebView canGoForward];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    return webkit_web_view_can_go_forward(pImpl->gtkWebView);
+  }
+#endif
+  return false;
+}
+
+void Window::executeScript(const std::string &script) {
+#ifdef _WIN32
+  if (pImpl->ready && pImpl->webview) {
+    pImpl->webview->ExecuteScript(
+        std::wstring(script.begin(), script.end()).c_str(), nullptr);
+  } else {
+    pImpl->pendingScripts.push_back(script);
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    NSString *js = [NSString stringWithUTF8String:script.c_str()];
+    [pImpl->wkWebView evaluateJavaScript:js completionHandler:nil];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_run_javascript(pImpl->gtkWebView, script.c_str(), nullptr,
+                                   nullptr, nullptr);
+  }
+#endif
+}
+
+void Window::executeScript(const std::string &script,
+                           std::function<void(const std::string &)> callback) {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->ExecuteScript(
+        std::wstring(script.begin(), script.end()).c_str(),
+        Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
+            [callback](HRESULT error, LPCWSTR result) -> HRESULT {
+              (void)error; // Suppress unused warning
+              if (result && callback) {
+                std::wstring wstr(result);
+                callback(std::string(wstr.begin(), wstr.end()));
+              }
+              return S_OK;
+            })
+            .Get());
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    NSString *js = [NSString stringWithUTF8String:script.c_str()];
+    [pImpl->wkWebView evaluateJavaScript:js
+                       completionHandler:^(id result, NSError *error) {
+                         if (result && callback) {
+                           NSString *resultStr =
+                               [NSString stringWithFormat:@"%@", result];
+                           callback([resultStr UTF8String]);
+                         }
+                       }];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    // GTK WebKit callback handling would go here
+    webkit_web_view_run_javascript(pImpl->gtkWebView, script.c_str(), nullptr,
+                                   nullptr, nullptr);
+  }
+#endif
+}
+
+void Window::openDevTools() {
+#ifdef _WIN32
+  if (pImpl->webview) {
+    pImpl->webview->OpenDevToolsWindow();
+  }
+#elif defined(__APPLE__)
+  // macOS: Dev tools open in Safari's Web Inspector
+#else
+  if (pImpl->gtkWebView) {
+    WebKitWebInspector *inspector =
+        webkit_web_view_get_inspector(pImpl->gtkWebView);
+    webkit_web_inspector_show(inspector);
+  }
+#endif
+}
+
+void Window::closeDevTools() {
+#ifdef _WIN32
+  // WebView2 doesn't have explicit close
+#elif defined(__APPLE__)
+  // macOS: Handled by Web Inspector
+#else
+  if (pImpl->gtkWebView) {
+    WebKitWebInspector *inspector =
+        webkit_web_view_get_inspector(pImpl->gtkWebView);
+    webkit_web_inspector_close(inspector);
+  }
+#endif
+}
+
+void Window::setUserAgent(const std::string &userAgent) {
+  pImpl->userAgent = userAgent;
+
+#ifdef _WIN32
+  if (pImpl->webview) {
+    ComPtr<ICoreWebView2Settings> settings;
+    pImpl->webview->get_Settings(&settings);
+    // WebView2 user agent requires settings2 interface
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView
+        setCustomUserAgent:[NSString stringWithUTF8String:userAgent.c_str()]];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    WebKitSettings *settings = webkit_web_view_get_settings(pImpl->gtkWebView);
+    webkit_settings_set_user_agent(settings, userAgent.c_str());
+  }
+#endif
+}
+
+std::string Window::getUserAgent() const { return pImpl->userAgent; }
+
+void Window::setZoom(double factor) {
+  pImpl->zoom = factor;
+
+#ifdef _WIN32
+  if (pImpl->controller) {
+    pImpl->controller->put_ZoomFactor(factor);
+  }
+#elif defined(__APPLE__)
+  if (pImpl->wkWebView) {
+    [pImpl->wkWebView setPageZoom:factor];
+  }
+#else
+  if (pImpl->gtkWebView) {
+    webkit_web_view_set_zoom_level(pImpl->gtkWebView, factor);
+  }
+#endif
+}
+
+double Window::getZoom() const { return pImpl->zoom; }
+
+void Window::injectCSS(const std::string &css) {
+  std::string script = R"(
+        (function() {
+            const style = document.createElement('style');
+            style.id = 'plusui-injected-css-' + Date.now();
+            style.textContent = `)" +
+                       css + R"(`;
+            if (document.head) {
+              document.head.appendChild(style);
+            } else {
+              document.documentElement.appendChild(style);
+            }
+        })();
+    )";
+
+  executeScript(script);
+}
+
 void Window::setWebviewDragDropEnabled(bool enabled) {
   if (enabled) {
     // Remove the dropzone init so it can be re-applied if needed later
@@ -2588,33 +2842,33 @@ void Window::setWebviewDragDropEnabled(bool enabled) {
     )");
   }
 }
-
-void Window::onNavigationStart(NavigationCallback callback) {
-  pImpl->navigationCallback = callback;
-}
-
-void Window::onNavigationComplete(LoadCallback callback) {
-  pImpl->navigationCompleteCallback = callback;
-}
-
-void Window::onLoadStart(LoadCallback callback) {
-  pImpl->loadStartCallback = callback;
-}
-
-void Window::onLoadEnd(LoadCallback callback) {
-  pImpl->loadEndCallback = callback;
-}
-
-void Window::onLoadError(ErrorCallback callback) {
-  pImpl->errorCallback = callback;
-}
-
-void Window::onConsoleMessage(ConsoleCallback callback) {
-  pImpl->consoleCallback = callback;
-}
-
-bool Window::isLoading() const { return pImpl->loading; }
-
-std::string Window::getURL() const { return pImpl->currentURL; }
-
-} // namespace plusui
+
+void Window::onNavigationStart(NavigationCallback callback) {
+  pImpl->navigationCallback = callback;
+}
+
+void Window::onNavigationComplete(LoadCallback callback) {
+  pImpl->navigationCompleteCallback = callback;
+}
+
+void Window::onLoadStart(LoadCallback callback) {
+  pImpl->loadStartCallback = callback;
+}
+
+void Window::onLoadEnd(LoadCallback callback) {
+  pImpl->loadEndCallback = callback;
+}
+
+void Window::onLoadError(ErrorCallback callback) {
+  pImpl->errorCallback = callback;
+}
+
+void Window::onConsoleMessage(ConsoleCallback callback) {
+  pImpl->consoleCallback = callback;
+}
+
+bool Window::isLoading() const { return pImpl->loading; }
+
+std::string Window::getURL() const { return pImpl->currentURL; }
+
+} // namespace plusui