plusui-native-core 0.1.105 → 0.1.106

package/Core/Features/App/app.cpp

@@ -1,82 +1,102 @@
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include <plusui/plusui.hpp>
-
-namespace plusui {
-
-struct App::Impl {
-  bool running = false;
-};
-
-App::App() : pImpl(std::make_unique<Impl>()) {}
-App::~App() = default;
-
-void App::run() {
-  pImpl->running = true;
-#ifdef _WIN32
-  MSG msg;
-  while (GetMessage(&msg, nullptr, 0, 0)) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-#endif
-}
-
-void App::quit() {
-  pImpl->running = false;
-#ifdef _WIN32
-  PostQuitMessage(0);
-#endif
-}
-
-App::Builder::Builder() = default;
-
-App::Builder &App::Builder::title(const std::string &t) {
-  config.title = t;
-  return *this;
-}
-App::Builder &App::Builder::width(int w) {
-  config.width = w;
-  return *this;
-}
-App::Builder &App::Builder::height(int h) {
-  config.height = h;
-  return *this;
-}
-App::Builder &App::Builder::resizable(bool r) {
-  config.resizable = r;
-  return *this;
-}
-App::Builder &App::Builder::devtools(bool d) {
-  config.devtools = d;
-  return *this;
-}
-App::Builder &App::Builder::trayIcon(const std::string &icon) {
-  config.trayIconPath = icon;
-  return *this;
-}
-App::Builder &App::Builder::trayTooltip(const std::string &tooltip) {
-  config.trayTooltip = tooltip;
-  return *this;
-}
-App::Builder &App::Builder::alwaysOnTop(bool top) {
-  config.alwaysOnTop = top;
-  return *this;
-}
-App::Builder &App::Builder::centered(bool center) {
-  config.centered = center;
-  return *this;
-}
-App::Builder &App::Builder::transparent(bool transparent) {
-  config.transparent = transparent;
-  return *this;
-}
-App::Builder &App::Builder::decorations(bool decorations) {
-  config.decorations = decorations;
-  return *this;
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#if defined(__APPLE__)
+#import <Cocoa/Cocoa.h>
+#endif
+
+#if defined(__linux__)
+#include <gtk/gtk.h>
+#endif
+
+#include <plusui/plusui.hpp>
+
+namespace plusui {
+
+struct App::Impl {
+  bool running = false;
+};
+
+App::App() : pImpl(std::make_unique<Impl>()) {}
+App::~App() = default;
+
+void App::run() {
+  pImpl->running = true;
+#ifdef _WIN32
+  MSG msg;
+  while (GetMessage(&msg, nullptr, 0, 0)) {
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
+  }
+#elif defined(__APPLE__)
+  // macOS: handled by NSApplicationMain or similar
+  while (pImpl->running) {
+    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
+  }
+#else
+  // Linux: GTK main loop
+  gtk_main();
+#endif
+}
+
+void App::quit() {
+  pImpl->running = false;
+#ifdef _WIN32
+  PostQuitMessage(0);
+#elif defined(__APPLE__)
+  // macOS: handled by NSApplication
+#else
+  gtk_main_quit();
+#endif
+}
+
+App::Builder::Builder() = default;
+
+App::Builder &App::Builder::title(const std::string &t) {
+  config.title = t;
+  return *this;
+}
+App::Builder &App::Builder::width(int w) {
+  config.width = w;
+  return *this;
+}
+App::Builder &App::Builder::height(int h) {
+  config.height = h;
+  return *this;
+}
+App::Builder &App::Builder::resizable(bool r) {
+  config.resizable = r;
+  return *this;
+}
+App::Builder &App::Builder::devtools(bool d) {
+  config.devtools = d;
+  return *this;
+}
+App::Builder &App::Builder::trayIcon(const std::string &icon) {
+  config.trayIconPath = icon;
+  return *this;
+}
+App::Builder &App::Builder::trayTooltip(const std::string &tooltip) {
+  config.trayTooltip = tooltip;
+  return *this;
+}
+App::Builder &App::Builder::alwaysOnTop(bool top) {
+  config.alwaysOnTop = top;
+  return *this;
+}
+App::Builder &App::Builder::centered(bool center) {
+  config.centered = center;
+  return *this;
+}
+App::Builder &App::Builder::transparent(bool transparent) {
+  config.transparent = transparent;
+  return *this;
+}
+App::Builder &App::Builder::decorations(bool decorations) {
+  config.decorations = decorations;
+  return *this;
 }
 App::Builder &App::Builder::skipTaskbar(bool skip) {
   config.skipTaskbar = skip;
@@ -109,26 +129,32 @@ Window App::Builder::build() {
   winConfig.scrollbars = config.scrollbars;
   winConfig.disableWebviewDragDrop =
       config.fileDrop; // Auto-disable browser drag-drop when OS file drop enabled
-
-  // Create native window
-  auto nativeWinPtr = std::make_shared<Window>(Window::create(winConfig));
-  nativeWinPtr->show();
-
-  // Create embedded webview window inside the native window
-  Window webviewWin = Window::create(nativeWinPtr->nativeHandle(), winConfig);
-  webviewWin.setWindow(nativeWinPtr);
-
-  if (!config.trayIconPath.empty()) {
-    nativeWinPtr->tray().setIcon(config.trayIconPath);
-    nativeWinPtr->tray().setVisible(true);
-    if (!config.trayTooltip.empty()) {
-      nativeWinPtr->tray().setTooltip(config.trayTooltip);
-    }
-  }
-
-  return webviewWin;
-}
-
-App::Builder createApp() { return App::Builder(); }
-
-} // namespace plusui
+
+  // Create native window (do not show yet — caller controls visibility)
+  auto nativeWinPtr = std::make_shared<Window>(Window::create(winConfig));
+
+  // Create embedded webview window inside the native window
+  Window webviewWin = Window::create(nativeWinPtr->nativeHandle(), winConfig);
+  webviewWin.setWindow(nativeWinPtr);
+
+  if (config.fileDrop) {
+    plusui::FileDrop::instance().attach(
+        nativeWinPtr->nativeHandle(),
+        webviewWin.nativeWebView()
+    );
+  }
+
+  if (!config.trayIconPath.empty()) {
+    nativeWinPtr->tray().setIcon(config.trayIconPath);
+    nativeWinPtr->tray().setVisible(true);
+    if (!config.trayTooltip.empty()) {
+      nativeWinPtr->tray().setTooltip(config.trayTooltip);
+    }
+  }
+
+  return webviewWin;
+}
+
+App::Builder createApp() { return App::Builder(); }
+
+} // namespace plusui