From 399899a095de01506d6c5dcd7da6cf0babddfb7e Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 26 Mar 2024 10:18:08 +0200
Subject: [PATCH] [NativeMenu] Move files to the `display` subfolder.

---
 platform/macos/native_menu_macos.h     | 2 +-
 platform/windows/native_menu_windows.h | 2 +-
 servers/SCsub                          | 2 +-
 servers/display/SCsub                  | 5 +++++
 servers/{ => display}/native_menu.cpp  | 0
 servers/{ => display}/native_menu.h    | 0
 servers/display_server.h               | 2 +-
 servers/register_server_types.cpp      | 2 +-
 8 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 servers/display/SCsub
 rename servers/{ => display}/native_menu.cpp (100%)
 rename servers/{ => display}/native_menu.h (100%)

diff --git a/platform/macos/native_menu_macos.h b/platform/macos/native_menu_macos.h
index c00a510fd53..1d9feb64a76 100644
--- a/platform/macos/native_menu_macos.h
+++ b/platform/macos/native_menu_macos.h
@@ -33,7 +33,7 @@
 
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
-#include "servers/native_menu.h"
+#include "servers/display/native_menu.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>
diff --git a/platform/windows/native_menu_windows.h b/platform/windows/native_menu_windows.h
index 6eab56d8b6d..74fd2319037 100644
--- a/platform/windows/native_menu_windows.h
+++ b/platform/windows/native_menu_windows.h
@@ -33,7 +33,7 @@
 
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
-#include "servers/native_menu.h"
+#include "servers/display/native_menu.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/servers/SCsub b/servers/SCsub
index 2e4430f030a..736bed68ecb 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -7,7 +7,6 @@ env.servers_sources = []
 env.add_source_files(env.servers_sources, "audio_server.cpp")
 env.add_source_files(env.servers_sources, "camera_server.cpp")
 env.add_source_files(env.servers_sources, "display_server.cpp")
-env.add_source_files(env.servers_sources, "native_menu.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_2d.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
 env.add_source_files(env.servers_sources, "physics_server_2d.cpp")
@@ -19,6 +18,7 @@ env.add_source_files(env.servers_sources, "text_server.cpp")
 SConscript("audio/SCsub")
 SConscript("camera/SCsub")
 SConscript("debugger/SCsub")
+SConscript("display/SCsub")
 SConscript("extensions/SCsub")
 SConscript("movie_writer/SCsub")
 SConscript("navigation/SCsub")
diff --git a/servers/display/SCsub b/servers/display/SCsub
new file mode 100644
index 00000000000..86681f9c74d
--- /dev/null
+++ b/servers/display/SCsub
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/native_menu.cpp b/servers/display/native_menu.cpp
similarity index 100%
rename from servers/native_menu.cpp
rename to servers/display/native_menu.cpp
diff --git a/servers/native_menu.h b/servers/display/native_menu.h
similarity index 100%
rename from servers/native_menu.h
rename to servers/display/native_menu.h
diff --git a/servers/display_server.h b/servers/display_server.h
index 85b791ca690..39a80ae7c1f 100644
--- a/servers/display_server.h
+++ b/servers/display_server.h
@@ -36,7 +36,7 @@
 #include "core/os/os.h"
 #include "core/variant/callable.h"
 
-#include "native_menu.h"
+#include "display/native_menu.h"
 
 class Texture2D;
 class Image;
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index 223d8f44e38..c03c0b7a404 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -57,11 +57,11 @@
 #include "camera/camera_feed.h"
 #include "camera_server.h"
 #include "debugger/servers_debugger.h"
+#include "display/native_menu.h"
 #include "display_server.h"
 #include "movie_writer/movie_writer.h"
 #include "movie_writer/movie_writer_mjpeg.h"
 #include "movie_writer/movie_writer_pngwav.h"
-#include "native_menu.h"
 #include "rendering/renderer_compositor.h"
 #include "rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "rendering/renderer_rd/storage_rd/render_data_rd.h"