Editor: Define IMGUI_DEFINE_MATH_OPERATORS before <imgui.h> (#209), thanks @ocornut

ocornut · thedmd · commit 1a84dba26869 · 2023-05-02T17:25:33.000+02:00
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -2,6 +2,8 @@ v0.9.2 (WIP):
 
     NEW: Editor: Add offset of hover/select to style (thanks @MultiPain)
 
+    CHANGE: Editor: Define IMGUI_DEFINE_MATH_OPERATORS before <imgui.h> (#209), thanks @ocornut
+
     BUGFIX: Editor: Correctly initialize 'width' for view resize code (thx @gnif)
 
     BUGFIX: Examples: Handle node deletion before links (#182)
diff --git a/imgui_canvas.cpp b/imgui_canvas.cpp
@@ -1,4 +1,6 @@
-# define IMGUI_DEFINE_MATH_OPERATORS
+# ifndef IMGUI_DEFINE_MATH_OPERATORS
+#     define IMGUI_DEFINE_MATH_OPERATORS
+# endif
 # include "imgui_canvas.h"
 # include <type_traits>
 
diff --git a/imgui_extra_math.h b/imgui_extra_math.h
@@ -15,10 +15,10 @@
 
 
 //------------------------------------------------------------------------------
-# include <imgui.h>
 # ifndef IMGUI_DEFINE_MATH_OPERATORS
 #     define IMGUI_DEFINE_MATH_OPERATORS
 # endif
+# include <imgui.h>
 # include <imgui_internal.h>
 
 
diff --git a/imgui_extra_math.inl b/imgui_extra_math.inl
@@ -34,7 +34,7 @@ inline ImVec2 operator*(const float lhs, const ImVec2& rhs)
     return ImVec2(lhs * rhs.x, lhs * rhs.y);
 }
 
-inline ImVec2 operator-(const ImVec2& lhs)
+inline static ImVec2 operator-(const ImVec2& lhs)
 {
     return ImVec2(-lhs.x, -lhs.y);
 }
diff --git a/imgui_node_editor_internal.h b/imgui_node_editor_internal.h
@@ -15,12 +15,14 @@
 
 
 //------------------------------------------------------------------------------
+# ifndef IMGUI_DEFINE_MATH_OPERATORS
+#     define IMGUI_DEFINE_MATH_OPERATORS
+# endif
 # include "imgui_node_editor.h"
 
 
 //------------------------------------------------------------------------------
 # include <imgui.h>
-# define IMGUI_DEFINE_MATH_OPERATORS
 # include <imgui_internal.h>
 # include "imgui_extra_math.h"
 # include "imgui_bezier_math.h"

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ inline ImVec2 operator*(const float lhs, const ImVec2& rhs)`
`34`	`34`	`return ImVec2(lhs * rhs.x, lhs * rhs.y);`
`35`	`35`	`}`
`36`	`36`
`37`		`-inline ImVec2 operator-(const ImVec2& lhs)`
	`37`	`+inline static ImVec2 operator-(const ImVec2& lhs)`
`38`	`38`	`{`
`39`	`39`	`return ImVec2(-lhs.x, -lhs.y);`
`40`	`40`	`}`