Update nativefiledialog and keep dialogs on top

WerWolv · Jun 24, 2024 · 279b2aa · 279b2aa
1 parent b93fd52
commit 279b2aa
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 5 deletions.
diff --git a/lib/libimhex/source/helpers/fs.cpp b/lib/libimhex/source/helpers/fs.cpp
@@ -24,6 +24,37 @@
     #include <emscripten.h>
 #else
     #include <nfd.hpp>
+    #if defined(OS_WINDOWS)
+        #define GLFW_EXPOSE_NATIVE_WIN32
+    #endif
+    #if defined(OS_MACOS)
+        // macOS platform headers can't be compiled with gcc
+        #define GLFW_NATIVE_INCLUDE_NONE
+        typedef uint32_t CGDirectDisplayID;
+        typedef void *id;
+        typedef void NSWindow;
+        #define GLFW_EXPOSE_NATIVE_COCOA
+    #endif
+    #if defined(OS_LINUX)
+        #define GLFW_EXPOSE_NATIVE_X11
+    #endif
+    #if defined(OS_LINUX) && defined(GLFW_WAYLAND_APP_ID)
+        #define GLFW_EXPOSE_NATIVE_WAYLAND
+    #endif
+    #include <nfd_glfw3.h>
+    #if defined(OS_LINUX) && defined(GLFW_WAYLAND_APP_ID)
+        #undef GLFW_EXPOSE_NATIVE_WAYLAND
+    #endif
+    #if defined(OS_LINUX)
+        #undef GLFW_EXPOSE_NATIVE_X11
+    #endif
+    #if defined(OS_MACOS)
+        #undef GLFW_EXPOSE_NATIVE_COCOA
+        #undef GLFW_NATIVE_INCLUDE_NONE
+    #endif
+    #if defined(OS_WINDOWS)
+        #undef GLFW_EXPOSE_NATIVE_WIN32
+    #endif
 #endif
 
 #include <filesystem>
@@ -232,20 +263,22 @@ namespace hex::fs {
             NFD::UniquePathU8 outPath;
             NFD::UniquePathSet outPaths;
             nfdresult_t result = NFD_ERROR;
+            nfdwindowhandle_t nativeWindow{};
+            NFD_GetNativeWindowFromGLFWWindow(ImHexApi::System::getMainWindowHandle(), &nativeWindow);
 
             // Open the correct file dialog based on the mode
             switch (mode) {
                 case DialogMode::Open:
                     if (multiple)
-                        result = NFD::OpenDialogMultiple(outPaths, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str());
+                        result = NFD::OpenDialogMultiple(outPaths, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str(), nativeWindow);
                     else
-                        result = NFD::OpenDialog(outPath, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str());
+                        result = NFD::OpenDialog(outPath, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str(), nativeWindow);
                     break;
                 case DialogMode::Save:
-                    result = NFD::SaveDialog(outPath, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str());
+                    result = NFD::SaveDialog(outPath, validExtensionsNfd.data(), validExtensionsNfd.size(), defaultPath.empty() ? nullptr : defaultPath.c_str(), nullptr, nativeWindow);
                     break;
                 case DialogMode::Folder:
-                    result = NFD::PickFolder(outPath, defaultPath.empty() ? nullptr : defaultPath.c_str());
+                    result = NFD::PickFolder(outPath, defaultPath.empty() ? nullptr : defaultPath.c_str(), nativeWindow);
                     break;
             }
 

diff --git a/lib/third_party/nativefiledialog b/lib/third_party/nativefiledialog
+102 −18		.github/workflows/cmake.yml
+3 −2		CMakeLists.txt
+117 −21		README.md
+3 −1		src/CMakeLists.txt
+407 −142		src/include/nfd.h
+99 −35		src/include/nfd.hpp
+85 −0		src/include/nfd_glfw3.h
+76 −0		src/include/nfd_sdl2.h
+236 −12		src/nfd_cocoa.m
+316 −14		src/nfd_gtk.cpp
+251 −33		src/nfd_portal.cpp
+1,178 −969		src/nfd_win.cpp
+45 −17		test/CMakeLists.txt
+49 −0		test/test_opendialog_native.c
+52 −0		test/test_opendialog_native_with.c
+39 −0		test/test_opendialog_with.c
+62 −0		test/test_opendialogmultiple_enum_native.c
+59 −0		test/test_opendialogmultiple_native.c
+42 −0		test/test_pickfolder_native.c
+43 −0		test/test_pickfolder_native_with.c
+34 −0		test/test_pickfolder_with.c
+47 −0		test/test_pickfoldermultiple.c
+52 −0		test/test_pickfoldermultiple_native.c
+55 −0		test/test_savedialog_native.c
+59 −0		test/test_savedialog_native_with.c
+40 −0		test/test_savedialog_with.c
+410 −0		test/test_sdl.c
+29 −0		test/test_sdl.manifest