From cfcb2625419677db763aa6ce011d6e8eb4c56309 Mon Sep 17 00:00:00 2001
From: OmniaX-dev <>
Date: Sun, 29 Oct 2023 01:23:24 +0200
Subject: [PATCH] Added ostd::SignalHandler::newCustomSignal(...)

---
 src/ogfx/DebugTools.hpp | 3 ++-
 src/ogfx/RTData.cpp     | 8 ++++----
 src/ogfx/RTData.hpp     | 2 +-
 src/ogfx/Widgets.hpp    | 3 ++-
 src/ostd/Signals.hpp    | 2 ++
 tools/build.nr          | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/ogfx/DebugTools.hpp b/src/ogfx/DebugTools.hpp
index 15def6a..5544d48 100644
--- a/src/ogfx/DebugTools.hpp
+++ b/src/ogfx/DebugTools.hpp
@@ -3,6 +3,7 @@
 #include <ostd/Utils.hpp>
 #include <unordered_map>
 #include <ostd/BaseObject.hpp>
+#include <ostd/Signals.hpp>
 #include <ogfx/RTData.hpp>
 #include <ogfx/Widgets.hpp>
 
@@ -87,7 +88,7 @@ namespace ogfx
 			inline static constexpr uint32_t OnWindowDisplay = 8;
 			inline static constexpr uint32_t TotalFrameTime = 128;
 
-			inline static const uint32_t OnProfileDataRecieved = ogfx::RTData::newCustomSignal(2200);
+			inline static const uint32_t OnProfileDataRecieved = ostd::SignalHandler::newCustomSignal(2200);
 
 			inline static void enableDebugWindow(bool enable = true) { m_debugWindowEnabled = enable; }
 	};
diff --git a/src/ogfx/RTData.cpp b/src/ogfx/RTData.cpp
index 73a08b5..f5dc093 100755
--- a/src/ogfx/RTData.cpp
+++ b/src/ogfx/RTData.cpp
@@ -5,8 +5,8 @@ namespace ogfx
 {
 	using namespace ostd;
 	
-	uint32_t RTData::newCustomSignal(uint32_t sub_id)
-	{
-		return tBuiltinSignals::CustomSignalBase + sub_id;
-	}
+	// uint32_t RTData::newCustomSignal(uint32_t sub_id)
+	// {
+	// 	return tBuiltinSignals::CustomSignalBase + sub_id;
+	// }
 }
\ No newline at end of file
diff --git a/src/ogfx/RTData.hpp b/src/ogfx/RTData.hpp
index 932bad3..7d4052e 100755
--- a/src/ogfx/RTData.hpp
+++ b/src/ogfx/RTData.hpp
@@ -11,7 +11,7 @@ namespace ogfx
 		public:
 			inline static float DeltaTime { 0.0f };
 			inline static ostd::IPoint windowSize { 0, 0 };
-			static uint32_t newCustomSignal(uint32_t sub_id);
+			// static uint32_t newCustomSignal(uint32_t sub_id);
 	};
 }
 
diff --git a/src/ogfx/Widgets.hpp b/src/ogfx/Widgets.hpp
index 79de83d..525b0d9 100644
--- a/src/ogfx/Widgets.hpp
+++ b/src/ogfx/Widgets.hpp
@@ -4,6 +4,7 @@
 #include <ostd/Geometry.hpp>
 #include <ostd/Color.hpp>
 #include <ogfx/RTData.hpp>
+#include <ostd/Signals.hpp>
 
 #include <unordered_map>
 
@@ -136,7 +137,7 @@ namespace ogfx
 				inline static ostd::WidgetID s_nextWidgetID = tWidgetState::ValidWidgetBase;
 
 			protected:
-				inline static const uint32_t OnWidgetFocusGainedSignal = RTData::newCustomSignal(1200);
+				inline static const uint32_t OnWidgetFocusGainedSignal = ostd::SignalHandler::newCustomSignal(1200);
 				WidgetTheme m_theme;
 				bool m_overrideGlobalTheme { false };
 				Widget* m_parent { nullptr };
diff --git a/src/ostd/Signals.hpp b/src/ostd/Signals.hpp
index 6d7a755..4913890 100755
--- a/src/ostd/Signals.hpp
+++ b/src/ostd/Signals.hpp
@@ -68,6 +68,8 @@ namespace ostd
 			static void emitSignal(uint32_t signal_id, uint8_t prio = tSignalPriority::Normal, BaseObject& userData = BaseObject::InvalidRef());
 			static void connect(BaseObject& object, uint32_t signal_id);
 
+			inline static uint32_t newCustomSignal(uint32_t sub_id) { return tBuiltinSignals::CustomSignalBase + sub_id; }
+
 		private:
 			inline static std::vector<tSignalObjPair> m_customRecievers;
 			inline static std::vector<tDelegateSignal> m_delegatedSignals;
diff --git a/tools/build.nr b/tools/build.nr
index ee67895..3755801 100755
--- a/tools/build.nr
+++ b/tools/build.nr
@@ -1 +1 @@
-1711
\ No newline at end of file
+1712
\ No newline at end of file