Merge pull request #36 from sphaero/v1.90.1

dfranx · web-flow · commit 0a74b0566e55 · 2024-09-16T14:02:52.000+02:00
Updates for imgui 1.90.x
diff --git a/ImFileDialog.cpp b/ImFileDialog.cpp
@@ -14,6 +14,7 @@
 #include "stb_image.h"
 
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #include <shellapi.h>
 #include <lmcons.h>
@@ -1406,10 +1407,9 @@ namespace ifd {
 				m_finalize();
 		}
 
-		int escapeKey = ImGui::GetIO().KeyMap[ImGuiKey_Escape];
-		if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
-			 escapeKey >= 0 && ImGui::IsKeyPressed(escapeKey))
-			m_isOpen = false;
+        if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
+             ImGuiKey_Escape >= 0 && ImGui::IsKeyPressed(ImGuiKey_Escape))
+            m_isOpen = false;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include "stb_image.h"`
`15`	`15`
`16`	`16`	`#ifdef _WIN32`
	`17`	`+#define NOMINMAX`
`17`	`18`	`#include <windows.h>`
`18`	`19`	`#include <shellapi.h>`
`19`	`20`	`#include <lmcons.h>`
`@@ -1406,10 +1407,9 @@ namespace ifd {`
`1406`	`1407`	`m_finalize();`
`1407`	`1408`	`}`
`1408`	`1409`
`1409`		`- int escapeKey = ImGui::GetIO().KeyMap[ImGuiKey_Escape];`
`1410`		`- if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&`
`1411`		`- escapeKey >= 0 && ImGui::IsKeyPressed(escapeKey))`
`1412`		`- m_isOpen = false;`
	`1410`	`+ if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&`
	`1411`	`+ ImGuiKey_Escape >= 0 && ImGui::IsKeyPressed(ImGuiKey_Escape))`
	`1412`	`+ m_isOpen = false;`
`1413`	`1413`	`}`
`1414`	`1414`	`}`
`1415`	`1415`