Refactor Placement and positioning strategy handling

Moved Placement enum and related documentation from geometry.h to a new placement.h file. Updated includes across the codebase to reference placement.h and positioning_strategy.h from their new locations. Added support for window-relative positioning strategies, including new API functions and logic to dynamically obtain window bounds for positioning. Renamed and relocated positioning_strategy files for improved organization.

Author: lijy91

src/capi/menu_c.cpp

@@ -5,7 +5,8 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include "../foundation/positioning_strategy.h"
+#include "../placement.h"
+#include "../positioning_strategy.h"
 #include "../global_registry.h"
 #include "../image.h"
 #include "../menu.h"

src/capi/positioning_strategy_c.cpp

@@ -1,5 +1,6 @@
 #include "positioning_strategy_c.h"
-#include "../foundation/positioning_strategy.h"
+#include "../positioning_strategy.h"
+#include "../window.h"
 
 using namespace nativeapi;
 
@@ -37,6 +38,23 @@ native_positioning_strategy_t native_positioning_strategy_relative(const native_
   return static_cast<native_positioning_strategy_t>(strategy);
 }
 
+native_positioning_strategy_t native_positioning_strategy_relative_to_window(native_window_t window,
+                                                                          const native_point_t* offset) {
+  if (!window) {
+    return nullptr;
+  }
+
+  auto* win = static_cast<nativeapi::Window*>(window);
+  nativeapi::Point cpp_offset{0, 0};
+  if (offset) {
+    cpp_offset = nativeapi::Point{offset->x, offset->y};
+  }
+
+  PositioningStrategy* strategy =
+      new PositioningStrategy(PositioningStrategy::Relative(*win, cpp_offset));
+  return static_cast<native_positioning_strategy_t>(strategy);
+}
+
 void native_positioning_strategy_free(native_positioning_strategy_t strategy) {
   if (strategy) {
     delete static_cast<PositioningStrategy*>(strategy);

src/capi/positioning_strategy_c.h

@@ -3,6 +3,7 @@
 #include <stdbool.h>
 
 #include "geometry_c.h"
+#include "window_c.h"
 
 #if _WIN32
 #define FFI_PLUGIN_EXPORT __declspec(dllexport)
@@ -61,6 +62,27 @@ FFI_PLUGIN_EXPORT
 native_positioning_strategy_t native_positioning_strategy_relative(const native_rectangle_t* rect,
                                                                    const native_point_t* offset);
 
+/**
+ * Create a positioning strategy for positioning relative to a window
+ * @param window Window to position relative to
+ * @param offset Offset point to apply to the position, or NULL for no offset
+ * @return Positioning strategy handle, or NULL if window is invalid
+ *
+ * This function obtains the window's bounds using native_window_get_bounds()
+ * and creates a Relative positioning strategy based on those bounds.
+ *
+ * @example
+ * ```c
+ * native_window_t window = native_window_manager_create(&options);
+ * native_point_t offset = {0, 10};
+ * native_positioning_strategy_t strategy = native_positioning_strategy_relative_to_window(window,
+ * &offset); native_menu_open(menu, strategy); native_positioning_strategy_free(strategy);
+ * ```
+ */
+FFI_PLUGIN_EXPORT
+native_positioning_strategy_t native_positioning_strategy_relative_to_window(native_window_t window,
+                                                                          const native_point_t* offset);
+
 /**
  * Free a positioning strategy handle
  * @param strategy The positioning strategy to free

src/foundation/geometry.h

@@ -28,99 +28,4 @@ struct Rectangle {
   double height;
 };
 
-/**
- * @brief Placement options for positioning UI elements relative to an anchor.
- *
- * Defines how a UI element (such as a menu, tooltip, or popover) should be
- * positioned relative to an anchor element or point. The placement consists
- * of a primary direction (top, right, bottom, left) and an optional alignment
- * (start, center, end).
- *
- * Primary directions:
- * - Top: Element appears above the anchor
- * - Right: Element appears to the right of the anchor
- * - Bottom: Element appears below the anchor
- * - Left: Element appears to the left of the anchor
- *
- * Alignments:
- * - Start: Element aligns to the start edge (left for horizontal, top for vertical)
- * - Center: Element centers along the anchor (default if not specified)
- * - End: Element aligns to the end edge (right for horizontal, bottom for vertical)
- *
- * @note Use with PositioningStrategy (defined in positioning_strategy.h) to
- *       specify both where and how to position UI elements.
- *
- * @example
- * ```cpp
- * // Position menu below the button, aligned to the left
- * menu->Open(PositioningStrategy::Absolute({100, 100}), Placement::BottomStart);
- *
- * // Position popover to the right, aligned to the top
- * popover->Open(PositioningStrategy::CursorPosition(), Placement::RightStart);
- * ```
- *
- * @see PositioningStrategy
- */
-enum class Placement {
-  /**
-   * Position above the anchor, horizontally centered.
-   */
-  Top,
-
-  /**
-   * Position above the anchor, aligned to the start (left).
-   */
-  TopStart,
-
-  /**
-   * Position above the anchor, aligned to the end (right).
-   */
-  TopEnd,
-
-  /**
-   * Position to the right of the anchor, vertically centered.
-   */
-  Right,
-
-  /**
-   * Position to the right of the anchor, aligned to the start (top).
-   */
-  RightStart,
-
-  /**
-   * Position to the right of the anchor, aligned to the end (bottom).
-   */
-  RightEnd,
-
-  /**
-   * Position below the anchor, horizontally centered.
-   */
-  Bottom,
-
-  /**
-   * Position below the anchor, aligned to the start (left).
-   */
-  BottomStart,
-
-  /**
-   * Position below the anchor, aligned to the end (right).
-   */
-  BottomEnd,
-
-  /**
-   * Position to the left of the anchor, vertically centered.
-   */
-  Left,
-
-  /**
-   * Position to the left of the anchor, aligned to the start (top).
-   */
-  LeftStart,
-
-  /**
-   * Position to the left of the anchor, aligned to the end (bottom).
-   */
-  LeftEnd
-};
-
 }  // namespace nativeapi

src/menu.h

@@ -10,7 +10,8 @@
 #include "foundation/geometry.h"
 #include "foundation/id_allocator.h"
 #include "foundation/native_object_provider.h"
-#include "foundation/positioning_strategy.h"
+#include "placement.h"
+#include "positioning_strategy.h"
 #include "menu_event.h"
 
 namespace nativeapi {

src/placement.h

@@ -0,0 +1,96 @@
+#pragma once
+
+namespace nativeapi {
+
+/**
+ * @brief Placement options for positioning UI elements relative to an anchor.
+ *
+ * Defines how a UI element (such as a menu, tooltip, or popover) should be
+ * positioned relative to an anchor element or point. The placement consists
+ * of a primary direction (top, right, bottom, left) and an optional alignment
+ * (start, center, end).
+ *
+ * Primary directions:
+ * - Top: Element appears above the anchor
+ * - Right: Element appears to the right of the anchor
+ * - Bottom: Element appears below the anchor
+ * - Left: Element appears to the left of the anchor
+ *
+ * Alignments:
+ * - Start: Element aligns to the start edge (left for horizontal, top for vertical)
+ * - Center: Element centers along the anchor (default if not specified)
+ * - End: Element aligns to the end edge (right for horizontal, bottom for vertical)
+ *
+ * @example
+ * ```cpp
+ * // Position menu below the button, aligned to the left
+ * menu->Open(PositioningStrategy::Absolute({100, 100}), Placement::BottomStart);
+ *
+ * // Position popover to the right, aligned to the top
+ * popover->Open(PositioningStrategy::CursorPosition(), Placement::RightStart);
+ * ```
+ */
+enum class Placement {
+  /**
+   * Position above the anchor, horizontally centered.
+   */
+  Top,
+
+  /**
+   * Position above the anchor, aligned to the start (left).
+   */
+  TopStart,
+
+  /**
+   * Position above the anchor, aligned to the end (right).
+   */
+  TopEnd,
+
+  /**
+   * Position to the right of the anchor, vertically centered.
+   */
+  Right,
+
+  /**
+   * Position to the right of the anchor, aligned to the start (top).
+   */
+  RightStart,
+
+  /**
+   * Position to the right of the anchor, aligned to the end (bottom).
+   */
+  RightEnd,
+
+  /**
+   * Position below the anchor, horizontally centered.
+   */
+  Bottom,
+
+  /**
+   * Position below the anchor, aligned to the start (left).
+   */
+  BottomStart,
+
+  /**
+   * Position below the anchor, aligned to the end (right).
+   */
+  BottomEnd,
+
+  /**
+   * Position to the left of the anchor, vertically centered.
+   */
+  Left,
+
+  /**
+   * Position to the left of the anchor, aligned to the start (top).
+   */
+  LeftStart,
+
+  /**
+   * Position to the left of the anchor, aligned to the end (bottom).
+   */
+  LeftEnd
+};
+
+}  // namespace nativeapi
+

src/platform/macos/tray_icon_macos.mm

@@ -1,6 +1,6 @@
 #include <optional>
 #include "../../foundation/geometry.h"
-#include "../../foundation/positioning_strategy.h"
+#include "../../positioning_strategy.h"
 #include "../../image.h"
 #include "../../menu.h"
 #include "../../tray_icon.h"

src/platform/windows/tray_icon_windows.cpp

@@ -10,7 +10,7 @@
 
 #include "../../foundation/geometry.h"
 #include "../../foundation/id_allocator.h"
-#include "../../foundation/positioning_strategy.h"
+#include "../../positioning_strategy.h"
 #include "../../image.h"
 #include "../../menu.h"
 #include "../../tray_icon.h"

src/foundation/positioning_strategy.cpp src/positioning_strategy.cppsrc/foundation/positioning_strategy.cpp renamed to src/positioning_strategy.cpp

@@ -1,9 +1,10 @@
 #include "positioning_strategy.h"
+#include "window.h"
 
 namespace nativeapi {
 
 PositioningStrategy::PositioningStrategy(Type type)
-    : type_(type), absolute_position_{0, 0}, relative_rect_{0, 0, 0, 0}, relative_offset_{0, 0} {}
+    : type_(type), absolute_position_{0, 0}, relative_rect_{0, 0, 0, 0}, relative_offset_{0, 0}, relative_window_(nullptr) {}
 
 PositioningStrategy PositioningStrategy::Absolute(const Point& point) {
   PositioningStrategy strategy(Type::Absolute);
@@ -19,7 +20,24 @@ PositioningStrategy PositioningStrategy::Relative(const Rectangle& rect, const P
   PositioningStrategy strategy(Type::Relative);
   strategy.relative_rect_ = rect;
   strategy.relative_offset_ = offset;
+  strategy.relative_window_ = nullptr;
   return strategy;
 }
 
+PositioningStrategy PositioningStrategy::Relative(const Window& window, const Point& offset) {
+  PositioningStrategy strategy(Type::Relative);
+  strategy.relative_window_ = &window;
+  strategy.relative_offset_ = offset;
+  // relative_rect_ will be obtained dynamically in GetRelativeRectangle()
+  return strategy;
+}
+
+Rectangle PositioningStrategy::GetRelativeRectangle() const {
+  if (relative_window_) {
+    return relative_window_->GetBounds();
+  }
+  return relative_rect_;
+}
+
 }  // namespace nativeapi
+