[editor] moved MenuBar to root since it's not a widget anymore (rathe…

…r a static chunk of code)
PanosK92 · Dec 19, 2024 · 0634d81 · 0634d81
1 parent 2279b79
commit 0634d81
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/editor/Editor.cpp b/editor/Editor.cpp
@@ -21,7 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //= INCLUDES ====================================
 #include "Editor.h"
-#include "EditorWindow.h"
+#include "EditorWindows.h"
+#include "MenuBar.h"
 #include "Core/Engine.h"
 #include "Core/Settings.h"
 #include "ImGui/ImGuiExtension.h"
@@ -30,7 +31,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Widgets/AssetBrowser.h"
 #include "Widgets/Console.h"
 #include "Widgets/Style.h"
-#include "Widgets/MenuBar.h"
 #include "Widgets/ProgressDialog.h"
 #include "Widgets/Properties.h"
 #include "Widgets/Viewport.h"
@@ -111,7 +111,7 @@ Editor::Editor(const vector<string>& args)
     // register imgui as a third party library (will show up in the about window)
     Spartan::Settings::RegisterThirdPartyLib("ImGui", IMGUI_VERSION, "https://github.com/ocornut/imgui");
 
-    EditorWindow::Initialize(this);
+    EditorWindows::Initialize(this);
 }
 
 Editor::~Editor()
@@ -159,7 +159,7 @@ void Editor::Tick()
                 ImGui::End();
 
                 // various windows that don't belnog to a certain widget
-                EditorWindow::Tick();
+                EditorWindows::Tick();
             }
         }
 

diff --git a/editor/EditorWindow.cpp → editor/EditorWindows.cpp b/editor/EditorWindow.cpp → editor/EditorWindows.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 //= INLUCDES ====================
-#include "EditorWindow.h"
+#include "EditorWindows.h"
 #include "ImGui/Source/imgui.h"
 #include "ImGui/ImGuiExtension.h"
 #include "Core/FileSystem.h"
@@ -509,7 +509,7 @@ namespace
     }
 }
 
-void EditorWindow::Initialize(Editor* editor_in)
+void EditorWindows::Initialize(Editor* editor_in)
 {
     editor = editor_in;
 
@@ -521,7 +521,7 @@ void EditorWindow::Initialize(Editor* editor_in)
     default_worlds::visible          =  default_worlds::downloaded;
 }
 
-void EditorWindow::Tick()
+void EditorWindows::Tick()
 {
     // visibility
     {
@@ -552,12 +552,12 @@ void EditorWindow::Tick()
     }
 }
 
-bool* EditorWindow::GetVisiblityWindowAbout()
+bool* EditorWindows::GetVisiblityWindowAbout()
 {
     return &about::visible;
 }
 
-bool* EditorWindow::GetVisiblityWindowShortcuts()
+bool* EditorWindows::GetVisiblityWindowShortcuts()
 {
     return &shortcuts::visible;
 }
diff --git a/editor/EditorWindow.h → editor/EditorWindows.h b/editor/EditorWindow.h → editor/EditorWindows.h
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Editor;
 
-class EditorWindow
+class EditorWindows
 {
 public:
     static void Initialize(Editor* editor);

diff --git a/editor/Widgets/MenuBar.cpp → editor/MenuBar.cpp b/editor/Widgets/MenuBar.cpp → editor/MenuBar.cpp
@@ -21,22 +21,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //= INCLUDES =====================
 #include "MenuBar.h"
-#include "../EditorWindow.h"
-#include "Profiler.h"
-#include "ShaderEditor.h"
-#include "RenderOptions.h"
-#include "TextureViewer.h"
-#include "ResourceViewer.h"
-#include "AssetBrowser.h"
-#include "Console.h"
-#include "Properties.h"
-#include "Viewport.h"
-#include "WorldViewer.h"
-#include "../Widgets/FileDialog.h"
+#include "EditorWindows.h"
+#include "Widgets/Profiler.h"
+#include "Widgets/ShaderEditor.h"
+#include "Widgets/RenderOptions.h"
+#include "Widgets/TextureViewer.h"
+#include "Widgets/ResourceViewer.h"
+#include "Widgets/AssetBrowser.h"
+#include "Widgets/Console.h"
+#include "Widgets/Properties.h"
+#include "Widgets/Viewport.h"
+#include "Widgets/WorldViewer.h"
+#include "Widgets/FileDialog.h"
+#include "Widgets/Style.h"
 #include "Engine.h"
 #include "Profiling/RenderDoc.h"
-#include <Debugging.h>
-#include "Style.h"
+#include "Debugging.h"
 //================================
 
 //= NAMESPACES =====
@@ -155,7 +155,7 @@ namespace
         {
             if (ImGui::BeginMenu("View"))
             {
-                if (ImGui::MenuItem("Shortcuts & Input Reference", "Ctrl+P", EditorWindow::GetVisiblityWindowShortcuts()))
+                if (ImGui::MenuItem("Shortcuts & Input Reference", "Ctrl+P", EditorWindows::GetVisiblityWindowShortcuts()))
                 {
 
                 }
@@ -193,7 +193,7 @@ namespace
         {
             if (ImGui::BeginMenu("Help"))
             {
-                ImGui::MenuItem("About", nullptr, EditorWindow::GetVisiblityWindowAbout());
+                ImGui::MenuItem("About", nullptr, EditorWindows::GetVisiblityWindowAbout());
 
                 if (ImGui::MenuItem("Sponsor", nullptr, nullptr))
                 {

diff --git a/editor/Widgets/MenuBar.h → editor/MenuBar.h b/editor/Widgets/MenuBar.h → editor/MenuBar.h