From 0a59ce6d9921c73effb04fee79c1b153f158accc Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Sat, 23 Dec 2023 18:12:52 -0500
Subject: [PATCH] upgrade to docking imgui 1.90.0 (#3402)

https://github.com/ocornut/imgui/commit/ce0d0ac8298ce164b5d862577e8b087d92f6e90e
---
 libultraship                                         | 2 +-
 soh/soh/Enhancements/audio/AudioEditor.h             | 3 +++
 soh/soh/Enhancements/controls/GameControlEditor.cpp  | 3 +++
 soh/soh/Enhancements/controls/SohInputEditorWindow.h | 3 +++
 soh/soh/Enhancements/debugconsole.cpp                | 4 ++++
 soh/soh/Enhancements/randomizer/randomizer.cpp       | 4 ++++
 soh/soh/SohGui.cpp                                   | 4 +++-
 soh/soh/SohMenuBar.cpp                               | 3 +++
 soh/soh/UIWidgets.cpp                                | 3 +++
 soh/soh/UIWidgets.hpp                                | 3 +++
 10 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/libultraship b/libultraship
index 7a8d314a0..d25e0e977 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 7a8d314a0ecc7d6ece1b12626a0ae917ee4ed666
+Subproject commit d25e0e977755ec09c22d6540963ffcd825954a23
diff --git a/soh/soh/Enhancements/audio/AudioEditor.h b/soh/soh/Enhancements/audio/AudioEditor.h
index dc058371d..766006ecc 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.h
+++ b/soh/soh/Enhancements/audio/AudioEditor.h
@@ -4,6 +4,9 @@
 #ifdef __cplusplus
 
 #include <libultraship/libultraship.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 
 class AudioEditor : public LUS::GuiWindow {
diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp
index 4643dc31d..98de43f34 100644
--- a/soh/soh/Enhancements/controls/GameControlEditor.cpp
+++ b/soh/soh/Enhancements/controls/GameControlEditor.cpp
@@ -7,6 +7,9 @@
 #include <iterator>
 #include <variables.h>
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/bridge.h>
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
index 089719a58..32443bb54 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.h
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
@@ -2,6 +2,9 @@
 
 #include "stdint.h"
 #include <libultraship/libultraship.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 #include <unordered_map>
 #include <string>
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 3e5a8e624..2c910a067 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -17,6 +17,10 @@
 
 #include <Window.h>
 #include <Context.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #undef PATH_HACK
 #undef Path
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index a850222bc..24c258506 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -12,6 +12,10 @@
 #include "3drando/rando_main.hpp"
 #include "3drando/random.hpp"
 #include "../../UIWidgets.hpp"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include "../custom-message/CustomMessageTypes.h"
 #include "../item-tables/ItemTableManager.h"
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index ecc7dd234..fa7072f5a 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -8,8 +8,10 @@
 #include "SohGui.hpp"
 
 #include <spdlog/spdlog.h>
-#include <ImGui/imgui.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/libultraship.h>
 #include <Fast3D/gfx_pc.h>
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 4e488521f..904a57558 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1,4 +1,7 @@
 #include "SohMenuBar.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "ImGui/imgui.h"
 #include "regex"
 #include "public/bridge/consolevariablebridge.h"
diff --git a/soh/soh/UIWidgets.cpp b/soh/soh/UIWidgets.cpp
index 15bb088a3..be8edf1c4 100644
--- a/soh/soh/UIWidgets.cpp
+++ b/soh/soh/UIWidgets.cpp
@@ -7,7 +7,10 @@
 
 #include "UIWidgets.hpp"
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
 #include <ImGui/imgui_internal.h>
 #include <libultraship/libultraship.h>
 
diff --git a/soh/soh/UIWidgets.hpp b/soh/soh/UIWidgets.hpp
index b18487977..031a46991 100644
--- a/soh/soh/UIWidgets.hpp
+++ b/soh/soh/UIWidgets.hpp
@@ -12,6 +12,9 @@
 #include <vector>
 #include <span>
 #include <stdint.h>
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include <ImGui/imgui.h>
 
 namespace UIWidgets {