From 879e4c9d584a34ecd11a99c5c0e66291b45bda9b Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sun, 16 Feb 2025 15:48:44 +0100
Subject: [PATCH] build: Move menu items handler into libimhex

---
 lib/libimhex/CMakeLists.txt                              | 5 ++++-
 .../libimhex/include/hex/helpers}/menu_items.hpp         | 0
 .../ui => lib/libimhex/source/helpers}/macos_menu.m      | 0
 plugins/builtin/source/content/main_menu_items.cpp       | 2 +-
 plugins/builtin/source/content/recent.cpp                | 2 +-
 plugins/builtin/source/content/views/view_about.cpp      | 2 +-
 plugins/builtin/source/content/views/view_hex_editor.cpp | 2 +-
 .../builtin/source/content/views/view_pattern_editor.cpp | 2 +-
 plugins/builtin/source/content/window_decoration.cpp     | 2 +-
 plugins/ui/CMakeLists.txt                                | 9 +--------
 plugins/ui/source/ui/menu_items.cpp                      | 2 +-
 11 files changed, 12 insertions(+), 16 deletions(-)
 rename {plugins/ui/include/ui => lib/libimhex/include/hex/helpers}/menu_items.hpp (100%)
 rename {plugins/ui/source/ui => lib/libimhex/source/helpers}/macos_menu.m (100%)

diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt
index beb62210f..071cf1735 100644
--- a/lib/libimhex/CMakeLists.txt
+++ b/lib/libimhex/CMakeLists.txt
@@ -66,7 +66,10 @@ if (APPLE)
         endif ()
     endif ()
 
-    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES} source/helpers/utils_macos.m)
+    set(LIBIMHEX_SOURCES ${LIBIMHEX_SOURCES}
+            source/helpers/utils_macos.m
+            source/helpers/macos_menu.m
+    )
 endif ()
 
 if (IMHEX_EXTERNAL_PLUGIN_BUILD)
diff --git a/plugins/ui/include/ui/menu_items.hpp b/lib/libimhex/include/hex/helpers/menu_items.hpp
similarity index 100%
rename from plugins/ui/include/ui/menu_items.hpp
rename to lib/libimhex/include/hex/helpers/menu_items.hpp
diff --git a/plugins/ui/source/ui/macos_menu.m b/lib/libimhex/source/helpers/macos_menu.m
similarity index 100%
rename from plugins/ui/source/ui/macos_menu.m
rename to lib/libimhex/source/helpers/macos_menu.m
diff --git a/plugins/builtin/source/content/main_menu_items.cpp b/plugins/builtin/source/content/main_menu_items.cpp
index 11ec4b400..1d2669adc 100644
--- a/plugins/builtin/source/content/main_menu_items.cpp
+++ b/plugins/builtin/source/content/main_menu_items.cpp
@@ -24,7 +24,7 @@
 #include <wolv/literals.hpp>
 
 #include <romfs/romfs.hpp>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 
 #include <GLFW/glfw3.h>
 
diff --git a/plugins/builtin/source/content/recent.cpp b/plugins/builtin/source/content/recent.cpp
index 30677d29d..7e4d7eb26 100644
--- a/plugins/builtin/source/content/recent.cpp
+++ b/plugins/builtin/source/content/recent.cpp
@@ -21,7 +21,7 @@
 
 #include <ranges>
 #include <unordered_set>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 
 namespace hex::plugin::builtin::recent {
 
diff --git a/plugins/builtin/source/content/views/view_about.cpp b/plugins/builtin/source/content/views/view_about.cpp
index d49e542fd..93c6d2147 100644
--- a/plugins/builtin/source/content/views/view_about.cpp
+++ b/plugins/builtin/source/content/views/view_about.cpp
@@ -20,7 +20,7 @@
 #include <wolv/utils/string.hpp>
 
 #include <string>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp
index a37b8d576..18cef4dd5 100644
--- a/plugins/builtin/source/content/views/view_hex_editor.cpp
+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp
@@ -25,7 +25,7 @@
 #include <content/popups/popup_blocking_task.hpp>
 #include <content/popups/hex_editor/popup_hex_editor_find.hpp>
 #include <pl/patterns/pattern.hpp>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 #include <wolv/literals.hpp>
 
 using namespace std::literals::string_literals;
diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp
index 100659a24..50972ce39 100644
--- a/plugins/builtin/source/content/views/view_pattern_editor.cpp
+++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp
@@ -36,7 +36,7 @@
 
 #include <content/global_actions.hpp>
 #include <fonts/fonts.hpp>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/window_decoration.cpp b/plugins/builtin/source/content/window_decoration.cpp
index d0a80a09c..9cb611060 100644
--- a/plugins/builtin/source/content/window_decoration.cpp
+++ b/plugins/builtin/source/content/window_decoration.cpp
@@ -12,7 +12,7 @@
 #include <imgui_internal.h>
 #include <random>
 #include <hex/ui/imgui_imhex_extensions.h>
-#include <ui/menu_items.hpp>
+#include <hex/helpers/menu_items.hpp>
 
 #include <fonts/vscode_icons.hpp>
 #include <hex/api/tutorial_manager.hpp>
diff --git a/plugins/ui/CMakeLists.txt b/plugins/ui/CMakeLists.txt
index 4e85bd638..5d194565a 100644
--- a/plugins/ui/CMakeLists.txt
+++ b/plugins/ui/CMakeLists.txt
@@ -17,11 +17,4 @@ add_imhex_plugin(
     LIBRARIES
         fonts
     LIBRARY_PLUGIN
-)
-
-if (APPLE)
-    target_sources(ui PRIVATE source/ui/macos_menu.m)
-    find_library(FOUNDATION NAMES Foundation REQUIRED)
-    find_library(COCOA NAMES Cocoa REQUIRED)
-    target_link_libraries(ui PUBLIC ${FOUNDATION} ${COCOA})
-endif()
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/plugins/ui/source/ui/menu_items.cpp b/plugins/ui/source/ui/menu_items.cpp
index 407c39840..f4fe92a27 100644
--- a/plugins/ui/source/ui/menu_items.cpp
+++ b/plugins/ui/source/ui/menu_items.cpp
@@ -1,4 +1,4 @@
-#include <ui/menu_items.hpp>
+#include <../../../../lib/libimhex/include/hex/helpers/menu_items.hpp>
 
 #include <imgui.h>
 #include <imgui_internal.h>