Refactor window creation API and remove WindowOptions

Window creation now uses default settings and is configured post-creation, removing the WindowOptions struct and related C API. WindowManager::Create and platform-specific implementations are removed; window registration is handled automatically. WindowCreatedEvent and WindowClosedEvent are no longer emitted, and related event types are removed from the C API. WindowRegistry gains a Contains method. Example code updated to reflect new window creation and configuration flow.

Author: lijy91

examples/application_c_example/main.c

@@ -47,23 +47,17 @@ int main() {
     return 1;
   }
 
-  // Create a simple window
-  native_window_options_t* window_options = native_window_options_create();
-  if (!window_options) {
-    fprintf(stderr, "Failed to create window options\n");
-    return 1;
-  }
-
-  native_window_options_set_title(window_options, "Application C Example Window");
-  native_window_options_set_size(window_options, 400.0, 300.0);
-
-  native_window_t window = native_window_manager_create(window_options);
+  // Create a simple window with default settings
+  native_window_t window = native_window_manager_create();
   if (!window) {
     fprintf(stderr, "Failed to create window\n");
-    native_window_options_destroy(window_options);
     return 1;
   }
 
+  // Configure the window
+  native_window_set_title(window, "Application C Example Window");
+  native_window_set_size(window, 400.0, 300.0, false);
+
   printf("Window created successfully\n");
   printf("Window ID: %ld\n", native_window_get_id(window));
 
@@ -80,7 +74,6 @@ int main() {
 
   // Clean up
   native_application_remove_event_listener(app, listener_id);
-  native_window_options_destroy(window_options);
 
   return exit_code;
 }

examples/application_example/main.cpp

@@ -35,13 +35,12 @@ int main() {
         std::cout << "Application deactivated event received" << std::endl;
       });
 
-  // Create a simple window
+  // Create a simple window (automatically registered)
   auto& window_manager = WindowManager::GetInstance();
 
-  WindowOptions window_options;
-  window_options.title = "Application Example Window";
+  auto window = std::make_shared<Window>();
+  window->SetTitle("Application Example Window");
 
-  auto window = window_manager.Create(window_options);
   if (!window) {
     std::cerr << "Failed to create window" << std::endl;
     return 1;

examples/window_c_example/main.c

@@ -309,16 +309,15 @@ native_menu_t create_context_menu(void) {
 }
 
 int main() {
-  // Create a new window with options
-  native_window_options_t* options = native_window_options_create();
-  native_window_options_set_title(options, "Window Example");
-  native_window_options_set_size(options, 800, 600);
-  native_window_options_set_minimum_size(options, 400, 300);
-  native_window_options_set_maximum_size(options, 1920, 1080);
-  native_window_options_set_centered(options, true);
-
-  g_window = native_window_manager_create(options);
-  native_window_options_destroy(options);
+  // Create a new window with default settings
+  g_window = native_window_manager_create();
+
+  // Configure the window
+  native_window_set_title(g_window, "Window Example");
+  native_window_set_size(g_window, 800, 600, false);
+  native_window_set_minimum_size(g_window, 400, 300);
+  native_window_set_maximum_size(g_window, 1920, 1080);
+  native_window_center(g_window);
 
   // Create tray icon
   g_tray_icon = native_tray_icon_create();

examples/window_example/main.cpp

@@ -22,7 +22,6 @@ using nativeapi::TrayIconRightClickedEvent;
 using nativeapi::TrayManager;
 using nativeapi::Window;
 using nativeapi::WindowManager;
-using nativeapi::WindowOptions;
 
 int main() {
   native_accessibility_manager_enable();
@@ -33,14 +32,13 @@ int main() {
   TrayManager& tray_manager = TrayManager::GetInstance();
   WindowManager& window_manager = WindowManager::GetInstance();
 
-  // Create a new window with options
-  WindowOptions options;
-  options.title = "Window Example";
-  options.size = {800, 600};
-  options.minimum_size = {400, 300};
-  options.maximum_size = {1920, 1080};
-  options.centered = true;
-  std::shared_ptr<Window> window_ptr = window_manager.Create(options);
+  // Create a new window (automatically registered)
+  std::shared_ptr<Window> window_ptr = std::make_shared<Window>();
+  window_ptr->SetTitle("Window Example");
+  window_ptr->SetSize({800, 600}, false);
+  window_ptr->SetMinimumSize({400, 300});
+  window_ptr->SetMaximumSize({1920, 1080});
+  window_ptr->Center();
 
   std::shared_ptr<TrayIcon> tray_icon_ptr = std::make_shared<TrayIcon>();
   if (tray_icon_ptr != nullptr) {

src/capi/window_c.cpp

@@ -5,93 +5,6 @@
 
 using namespace nativeapi;
 
-// Window options creation and destruction
-FFI_PLUGIN_EXPORT
-native_window_options_t* native_window_options_create(void) {
-  auto* options = new (std::nothrow) native_window_options_t;
-  if (!options)
-    return nullptr;
-
-  // Initialize with default values
-  options->title = nullptr;
-  options->size = {800.0, 600.0};
-  options->minimum_size = {0.0, 0.0};
-  options->maximum_size = {0.0, 0.0};
-  options->centered = true;
-
-  return options;
-}
-
-FFI_PLUGIN_EXPORT
-void native_window_options_destroy(native_window_options_t* options) {
-  if (!options)
-    return;
-
-  if (options->title) {
-    free_c_str(options->title);
-  }
-  delete options;
-}
-
-FFI_PLUGIN_EXPORT
-bool native_window_options_set_title(native_window_options_t* options, const char* title) {
-  if (!options)
-    return false;
-
-  // Free existing title
-  if (options->title) {
-    free_c_str(options->title);
-    options->title = nullptr;
-  }
-
-  if (title) {
-    std::string title_str(title);
-    options->title = to_c_str(title_str);
-    // to_c_str returns nullptr for empty strings, which is acceptable for title
-    // For non-empty strings, nullptr indicates allocation failure
-    if (!options->title && !title_str.empty()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_size(native_window_options_t* options, double width, double height) {
-  if (!options)
-    return;
-  options->size.width = width;
-  options->size.height = height;
-}
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_minimum_size(native_window_options_t* options,
-                                            double width,
-                                            double height) {
-  if (!options)
-    return;
-  options->minimum_size.width = width;
-  options->minimum_size.height = height;
-}
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_maximum_size(native_window_options_t* options,
-                                            double width,
-                                            double height) {
-  if (!options)
-    return;
-  options->maximum_size.width = width;
-  options->maximum_size.height = height;
-}
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_centered(native_window_options_t* options, bool centered) {
-  if (!options)
-    return;
-  options->centered = centered;
-}
-
 // Window basic operations
 FFI_PLUGIN_EXPORT
 native_window_id_t native_window_get_id(native_window_t window) {

src/capi/window_c.h

@@ -20,17 +20,6 @@ extern "C" {
  */
 typedef long native_window_id_t;
 
-/**
- * Window options structure for creating windows
- */
-typedef struct {
-  char* title;                 // Window title
-  native_size_t size;          // Initial window size
-  native_size_t minimum_size;  // Minimum window size
-  native_size_t maximum_size;  // Maximum window size
-  bool centered;               // Whether to center the window on screen
-} native_window_options_t;
-
 /**
  * Opaque window handle
  */
@@ -44,32 +33,6 @@ typedef struct {
   long count;
 } native_window_list_t;
 
-// Window creation and destruction
-FFI_PLUGIN_EXPORT
-native_window_options_t* native_window_options_create(void);
-
-FFI_PLUGIN_EXPORT
-void native_window_options_destroy(native_window_options_t* options);
-
-FFI_PLUGIN_EXPORT
-bool native_window_options_set_title(native_window_options_t* options, const char* title);
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_size(native_window_options_t* options, double width, double height);
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_minimum_size(native_window_options_t* options,
-                                            double width,
-                                            double height);
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_maximum_size(native_window_options_t* options,
-                                            double width,
-                                            double height);
-
-FFI_PLUGIN_EXPORT
-void native_window_options_set_centered(native_window_options_t* options, bool centered);
-
 // Window basic operations
 FFI_PLUGIN_EXPORT
 native_window_id_t native_window_get_id(native_window_t window);

src/capi/window_manager_c.cpp

@@ -19,25 +19,6 @@ static std::mutex g_callback_mutex;
 static std::unordered_map<int, EventCallbackInfo> g_event_callbacks;
 static int g_next_callback_id = 1;
 
-// Helper function to convert C++ WindowOptions to C options
-static WindowOptions ConvertToWindowOptions(const native_window_options_t* options) {
-  WindowOptions cpp_options;
-
-  if (options->title) {
-    cpp_options.title = std::string(options->title);
-  }
-
-  cpp_options.size.width = options->size.width;
-  cpp_options.size.height = options->size.height;
-  cpp_options.minimum_size.width = options->minimum_size.width;
-  cpp_options.minimum_size.height = options->minimum_size.height;
-  cpp_options.maximum_size.width = options->maximum_size.width;
-  cpp_options.maximum_size.height = options->maximum_size.height;
-  cpp_options.centered = options->centered;
-
-  return cpp_options;
-}
-
 // Helper function to create native_window_t from shared_ptr<Window>
 static native_window_t CreateNativeWindowHandle(std::shared_ptr<Window> window) {
   if (!window)
@@ -67,20 +48,6 @@ class CEventListener {
     auto& manager = WindowManager::GetInstance();
 
     // Register for various window events
-    manager.AddListener<WindowCreatedEvent>([this](const WindowCreatedEvent& e) {
-      native_window_event_t event;
-      event.type = NATIVE_WINDOW_EVENT_CREATED;
-      event.window_id = e.GetWindowId();
-      DispatchEvent(event);
-    });
-
-    manager.AddListener<WindowClosedEvent>([this](const WindowClosedEvent& e) {
-      native_window_event_t event;
-      event.type = NATIVE_WINDOW_EVENT_CLOSED;
-      event.window_id = e.GetWindowId();
-      DispatchEvent(event);
-    });
-
     manager.AddListener<WindowFocusedEvent>([this](const WindowFocusedEvent& e) {
       native_window_event_t event;
       event.type = NATIVE_WINDOW_EVENT_FOCUSED;
@@ -147,15 +114,10 @@ static void* g_will_hide_ud = nullptr;
 
 // Window manager operations
 FFI_PLUGIN_EXPORT
-native_window_t native_window_manager_create(const native_window_options_t* options) {
-  if (!options)
-    return nullptr;
-
+native_window_t native_window_manager_create(void) {
   try {
-    WindowOptions cpp_options = ConvertToWindowOptions(options);
-    auto& manager = WindowManager::GetInstance();
-    auto window = manager.Create(cpp_options);
-
+    // Create window with default settings (automatically registered)
+    auto window = std::make_shared<Window>();
     return CreateNativeWindowHandle(window);
   } catch (...) {
     return nullptr;

src/capi/window_manager_c.h

@@ -19,15 +19,13 @@ extern "C" {
  * Window event types
  */
 typedef enum {
-  NATIVE_WINDOW_EVENT_CREATED = 0,
-  NATIVE_WINDOW_EVENT_CLOSED = 1,
-  NATIVE_WINDOW_EVENT_FOCUSED = 2,
-  NATIVE_WINDOW_EVENT_BLURRED = 3,
-  NATIVE_WINDOW_EVENT_MINIMIZED = 4,
-  NATIVE_WINDOW_EVENT_MAXIMIZED = 5,
-  NATIVE_WINDOW_EVENT_RESTORED = 6,
-  NATIVE_WINDOW_EVENT_MOVED = 7,
-  NATIVE_WINDOW_EVENT_RESIZED = 8
+  NATIVE_WINDOW_EVENT_FOCUSED = 0,
+  NATIVE_WINDOW_EVENT_BLURRED = 1,
+  NATIVE_WINDOW_EVENT_MINIMIZED = 2,
+  NATIVE_WINDOW_EVENT_MAXIMIZED = 3,
+  NATIVE_WINDOW_EVENT_RESTORED = 4,
+  NATIVE_WINDOW_EVENT_MOVED = 5,
+  NATIVE_WINDOW_EVENT_RESIZED = 6
 } native_window_event_type_t;
 
 /**
@@ -56,12 +54,11 @@ typedef void (*native_window_event_callback_t)(const native_window_event_t* even
  */
 
 /**
- * Create a new window with the specified options
- * @param options Window creation options
+ * Create a new window with default settings
  * @return Window handle, or NULL if creation failed
  */
 FFI_PLUGIN_EXPORT
-native_window_t native_window_manager_create(const native_window_options_t* options);
+native_window_t native_window_manager_create(void);
 
 /**
  * Get a window by its ID

src/foundation/object_registry.h

@@ -58,6 +58,20 @@ class ObjectRegistry {
     return it == objects_.end() ? nullptr : it->second;
   }
 
+  /**
+   * @brief Check if an object exists for the given ID.
+   *
+   * This operation is O(1) average-case.
+   *
+   * @param id The identifier to check.
+   * @return true If an entry exists for the given ID.
+   * @return false If no entry exists for the given ID.
+   */
+  bool Contains(TId id) const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return objects_.find(id) != objects_.end();
+  }
+
   /**
    * @brief Get a snapshot vector of all stored objects.
    *