Move storage.h to src/ and update includes

lijy91 · lijy91 · commit d1d67316a290 · 2025-11-03T21:11:49.000+08:00
Renamed src/foundation/storage.h to src/storage.h and updated all relevant include paths throughout the codebase. This improves header organization and simplifies include statements for storage functionality.
diff --git a/examples/tray_icon_c_example/main.c b/examples/tray_icon_c_example/main.c
@@ -176,7 +176,8 @@ int main() {
   native_tray_icon_set_context_menu_trigger(tray_icon, NATIVE_CONTEXT_MENU_TRIGGER_RIGHT_CLICKED);
 
   // Get and display the current trigger mode
-  native_context_menu_trigger_t current_trigger = native_tray_icon_get_context_menu_trigger(tray_icon);
+  native_context_menu_trigger_t current_trigger =
+      native_tray_icon_get_context_menu_trigger(tray_icon);
   printf("Context menu trigger mode: ");
   switch (current_trigger) {
     case NATIVE_CONTEXT_MENU_TRIGGER_NONE:
diff --git a/examples/tray_icon_example/main.cpp b/examples/tray_icon_example/main.cpp
@@ -107,7 +107,7 @@ int main() {
   // Set context menu trigger to automatically show menu on right click
   // This is the common behavior on Windows and most desktop environments
   trayIcon->SetContextMenuTrigger(ContextMenuTrigger::RightClicked);
-  
+
   // Get and display the current trigger mode
   ContextMenuTrigger currentTrigger = trayIcon->GetContextMenuTrigger();
   std::cout << "Context menu trigger mode: ";
@@ -150,7 +150,8 @@ int main() {
   std::cout << std::endl;
   std::cout << "Note: The context menu is automatically shown on right-click" << std::endl;
   std::cout << "      because we set ContextMenuTrigger::RightClicked." << std::endl;
-  std::cout << "      You can also use Clicked, DoubleClicked, or None for manual control." << std::endl;
+  std::cout << "      You can also use Clicked, DoubleClicked, or None for manual control."
+            << std::endl;
   std::cout << std::endl;
   std::cout << "Use the Exit menu item to quit the application." << std::endl;
   std::cout << "========================================" << std::endl;
diff --git a/include/nativeapi.h b/include/nativeapi.h
@@ -12,13 +12,13 @@
 #include "../src/foundation/event_emitter.h"
 #include "../src/foundation/geometry.h"
 #include "../src/foundation/id_allocator.h"
-#include "../src/foundation/storage.h"
 #include "../src/image.h"
 #include "../src/keyboard_event.h"
 #include "../src/keyboard_monitor.h"
 #include "../src/menu.h"
 #include "../src/preferences.h"
 #include "../src/secure_storage.h"
+#include "../src/storage.h"
 #include "../src/tray_icon.h"
 #include "../src/tray_icon_event.h"
 #include "../src/tray_manager.h"
diff --git a/src/capi/menu_c.cpp b/src/capi/menu_c.cpp
@@ -5,11 +5,11 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include "../placement.h"
-#include "../positioning_strategy.h"
 #include "../global_registry.h"
 #include "../image.h"
 #include "../menu.h"
+#include "../placement.h"
+#include "../positioning_strategy.h"
 #include "string_utils_c.h"
 
 using namespace nativeapi;
diff --git a/src/capi/positioning_strategy_c.cpp b/src/capi/positioning_strategy_c.cpp
@@ -38,8 +38,9 @@ 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) {
+native_positioning_strategy_t native_positioning_strategy_relative_to_window(
+    native_window_t window,
+    const native_point_t* offset) {
   if (!window) {
     return nullptr;
   }
diff --git a/src/capi/positioning_strategy_c.h b/src/capi/positioning_strategy_c.h
@@ -80,8 +80,9 @@ native_positioning_strategy_t native_positioning_strategy_relative(const native_
  * ```
  */
 FFI_PLUGIN_EXPORT
-native_positioning_strategy_t native_positioning_strategy_relative_to_window(native_window_t window,
-                                                                          const native_point_t* offset);
+native_positioning_strategy_t native_positioning_strategy_relative_to_window(
+    native_window_t window,
+    const native_point_t* offset);
 
 /**
  * Free a positioning strategy handle
diff --git a/src/capi/tray_icon_c.cpp b/src/capi/tray_icon_c.cpp
@@ -237,7 +237,7 @@ void native_tray_icon_set_context_menu_trigger(native_tray_icon_t tray_icon,
 
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
-    
+
     // Convert C enum to C++ enum
     ContextMenuTrigger cpp_trigger;
     switch (trigger) {
@@ -257,7 +257,7 @@ void native_tray_icon_set_context_menu_trigger(native_tray_icon_t tray_icon,
         cpp_trigger = ContextMenuTrigger::None;
         break;
     }
-    
+
     tray_icon_ptr->SetContextMenuTrigger(cpp_trigger);
   } catch (...) {
     // Ignore exceptions
@@ -272,7 +272,7 @@ native_context_menu_trigger_t native_tray_icon_get_context_menu_trigger(
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
     ContextMenuTrigger cpp_trigger = tray_icon_ptr->GetContextMenuTrigger();
-    
+
     // Convert C++ enum to C enum
     switch (cpp_trigger) {
       case ContextMenuTrigger::None:
diff --git a/src/menu.h b/src/menu.h
@@ -10,9 +10,9 @@
 #include "foundation/geometry.h"
 #include "foundation/id_allocator.h"
 #include "foundation/native_object_provider.h"
+#include "menu_event.h"
 #include "placement.h"
 #include "positioning_strategy.h"
-#include "menu_event.h"
 
 namespace nativeapi {
 
diff --git a/src/placement.h b/src/placement.h
@@ -93,4 +93,3 @@ enum class Placement {
 };
 
 }  // namespace nativeapi
-
diff --git a/src/platform/macos/tray_icon_macos.mm b/src/platform/macos/tray_icon_macos.mm
@@ -1,8 +1,8 @@
 #include <optional>
 #include "../../foundation/geometry.h"
-#include "../../positioning_strategy.h"
 #include "../../image.h"
 #include "../../menu.h"
+#include "../../positioning_strategy.h"
 #include "../../tray_icon.h"
 #include "../../tray_icon_event.h"
 
diff --git a/src/platform/windows/dpi_utils_windows.cpp b/src/platform/windows/dpi_utils_windows.cpp
@@ -4,15 +4,16 @@ namespace nativeapi {
 
 // Internal: per-monitor DPI via Shcore when available
 static double GetScaleFactorForMonitor(HMONITOR hmonitor) {
-  if (!hmonitor) return 1.0;
+  if (!hmonitor)
+    return 1.0;
   typedef HRESULT(WINAPI * GetDpiForMonitorFunc)(HMONITOR, int, UINT*, UINT*);
   static GetDpiForMonitorFunc pGetDpiForMonitor = nullptr;
   static bool resolved = false;
   if (!resolved) {
     HMODULE hShcore = LoadLibraryW(L"Shcore.dll");
     if (hShcore) {
-      pGetDpiForMonitor = reinterpret_cast<GetDpiForMonitorFunc>(
-          GetProcAddress(hShcore, "GetDpiForMonitor"));
+      pGetDpiForMonitor =
+          reinterpret_cast<GetDpiForMonitorFunc>(GetProcAddress(hShcore, "GetDpiForMonitor"));
     }
     resolved = true;
   }
@@ -34,8 +35,8 @@ double GetScaleFactorForWindow(HWND hwnd) {
     if (!resolved_win) {
       HMODULE hUser32 = LoadLibraryW(L"user32.dll");
       if (hUser32) {
-        pGetDpiForWindow = reinterpret_cast<GetDpiForWindowFunc>(
-            GetProcAddress(hUser32, "GetDpiForWindow"));
+        pGetDpiForWindow =
+            reinterpret_cast<GetDpiForWindowFunc>(GetProcAddress(hUser32, "GetDpiForWindow"));
       }
       resolved_win = true;
     }
@@ -49,7 +50,8 @@ double GetScaleFactorForWindow(HWND hwnd) {
     // Fallback: per-monitor DPI
     HMONITOR hmonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
     double monitor_scale = GetScaleFactorForMonitor(hmonitor);
-    if (monitor_scale > 0.0) return monitor_scale;
+    if (monitor_scale > 0.0)
+      return monitor_scale;
   }
 
   // Fallback: system DPI
@@ -65,5 +67,3 @@ double GetScaleFactorForWindow(HWND hwnd) {
 }
 
 }  // namespace nativeapi
-
-
diff --git a/src/platform/windows/dpi_utils_windows.h b/src/platform/windows/dpi_utils_windows.h
@@ -7,5 +7,3 @@ namespace nativeapi {
 double GetScaleFactorForWindow(HWND hwnd);
 
 }  // namespace nativeapi
-
-
diff --git a/src/platform/windows/menu_windows.cpp b/src/platform/windows/menu_windows.cpp
@@ -715,7 +715,8 @@ bool Menu::Open(const PositioningStrategy& strategy, Placement placement) {
         // rect and offset are in logical pixels (DIP) for Window-relative
         HWND rel_hwnd = static_cast<HWND>(strategy.GetRelativeWindow()->GetNativeObject());
         double scale = GetScaleFactorForWindow(rel_hwnd);
-        if (scale <= 0.0) scale = 1.0;
+        if (scale <= 0.0)
+          scale = 1.0;
         pt.x = static_cast<int>(std::lround((rect.x + offset.x) * scale));
         pt.y = static_cast<int>(std::lround((rect.y + offset.y) * scale));
       } else {
diff --git a/src/platform/windows/tray_icon_windows.cpp b/src/platform/windows/tray_icon_windows.cpp
@@ -10,9 +10,9 @@
 
 #include "../../foundation/geometry.h"
 #include "../../foundation/id_allocator.h"
-#include "../../positioning_strategy.h"
 #include "../../image.h"
 #include "../../menu.h"
+#include "../../positioning_strategy.h"
 #include "../../tray_icon.h"
 #include "../../tray_icon_event.h"
 #include "string_utils_windows.h"
diff --git a/src/platform/windows/window_windows.cpp b/src/platform/windows/window_windows.cpp
@@ -2,8 +2,8 @@
 #include <iostream>
 #include "../../window.h"
 #include "../../window_manager.h"
-#include "string_utils_windows.h"
 #include "dpi_utils_windows.h"
+#include "string_utils_windows.h"
 
 namespace nativeapi {
 
@@ -266,7 +266,8 @@ Rectangle Window::GetContentBounds() const {
     ClientToScreen(pimpl_->hwnd_, &bottomRight);
 
     double scale = GetScaleFactorForWindow(pimpl_->hwnd_);
-    if (scale <= 0.0) scale = 1.0;
+    if (scale <= 0.0)
+      scale = 1.0;
 
     // Return logical pixels (DIP) by dividing by scale
     bounds.x = static_cast<double>(topLeft.x) / scale;
diff --git a/src/positioning_strategy.cpp b/src/positioning_strategy.cpp
@@ -4,7 +4,11 @@
 namespace nativeapi {
 
 PositioningStrategy::PositioningStrategy(Type type)
-    : type_(type), absolute_position_{0, 0}, relative_rect_{0, 0, 0, 0}, relative_offset_{0, 0}, relative_window_(nullptr) {}
+    : 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);
diff --git a/src/positioning_strategy.h b/src/positioning_strategy.h
@@ -174,8 +174,7 @@ class PositioningStrategy {
   Point absolute_position_;
   Rectangle relative_rect_;
   Point relative_offset_;
-  const Window* relative_window_;  // Optional: when set, GetRelativeRectangle() will use window->GetBounds()
+  const Window* relative_window_;
 };
 
 }  // namespace nativeapi
-
diff --git a/src/preferences.h b/src/preferences.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "foundation/storage.h"
+#include "storage.h"
 
 namespace nativeapi {
 
diff --git a/src/secure_storage.h b/src/secure_storage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "foundation/storage.h"
+#include "storage.h"
 
 namespace nativeapi {
 
diff --git a/src/storage.h b/src/storage.h

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,9 @@ native_positioning_strategy_t native_positioning_strategy_relative(const native_`
`38`	`38`	`return static_cast<native_positioning_strategy_t>(strategy);`
`39`	`39`	`}`
`40`	`40`
`41`		`-native_positioning_strategy_t native_positioning_strategy_relative_to_window(native_window_t window,`
`42`		`- const native_point_t* offset) {`
	`41`	`+native_positioning_strategy_t native_positioning_strategy_relative_to_window(`
	`42`	`+ native_window_t window,`
	`43`	`+ const native_point_t* offset) {`
`43`	`44`	`if (!window) {`
`44`	`45`	`return nullptr;`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,3 @@ enum class Placement {`
`93`	`93`	`};`
`94`	`94`
`95`	`95`	`} // namespace nativeapi`
`96`		`-`