Skip to content

🐛 Force filesystem results for JVM Windows dialogs #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vinceglb merged 1 commit into from
Jul 20, 2026
+28 −1
Merged

🐛 Force filesystem results for JVM Windows dialogs #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ...c/jvmMain/kotlin/io/github/vinceglb/filekit/dialogs/platform/windows/WindowsFilePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import io.github.vinceglb.filekit.dialogs.platform.windows.jna.IFileSaveDialog
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.IShellItem
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.COMDLG_FILTERSPEC
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.FILEOPENDIALOGOPTIONS.Companion.FOS_ALLOWMULTISELECT
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.FILEOPENDIALOGOPTIONS.Companion.FOS_FORCEFILESYSTEM
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.FILEOPENDIALOGOPTIONS.Companion.FOS_PICKFOLDERS
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.SIGDN.Companion.SIGDN_DESKTOPABSOLUTEPARSING
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.SIGDN.Companion.SIGDN_FILESYSPATH
Expand Down Expand Up @@ -170,6 +171,8 @@ internal class WindowsFilePicker : PlatformFilePicker {
).verify("CoCreateInstance failed")
.let { type.build(pbrFileDialog) }

fileDialog.updateOptions(::requiredFileDialogOptions)

// Run the block
block(fileDialog)
} finally {
Expand Down Expand Up @@ -263,12 +266,16 @@ internal class WindowsFilePicker : PlatformFilePicker {
}

private fun FileDialog.setFlag(flag: Int) {
updateOptions { options -> options or flag }
}

private fun FileDialog.updateOptions(transform: (Int) -> Int) {
// Get the dialog options
val ref = IntByReference()
this.GetOptions(ref).verify("GetOptions failed")

// Set the dialog options
this.SetOptions(ref.value or flag).verify("SetOptions failed")
this.SetOptions(transform(ref.value)).verify("SetOptions failed")
}

private fun <FD : FileDialog, T> FD.show(
Expand Down Expand Up @@ -398,3 +405,5 @@ internal class WindowsFilePicker : PlatformFilePicker {
}
}
}

internal fun requiredFileDialogOptions(options: Int): Int = options or FOS_FORCEFILESYSTEM
18 changes: 18 additions & 0 deletions ...otlin/io/github/vinceglb/filekit/dialogs/platform/windows/WindowsFilePickerOptionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@file:Suppress("ktlint:standard:function-naming", "TestFunctionName")

package io.github.vinceglb.filekit.dialogs.platform.windows

import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.FILEOPENDIALOGOPTIONS.Companion.FOS_ALLOWMULTISELECT
import io.github.vinceglb.filekit.dialogs.platform.windows.jna.ShTypes.FILEOPENDIALOGOPTIONS.Companion.FOS_FORCEFILESYSTEM
import kotlin.test.Test
import kotlin.test.assertEquals

class WindowsFilePickerOptionsTest {
@Test
fun requiredFileDialogOptions_whenOptionsAlreadyExist_preservesOptionsAndForcesFilesystemResults() {
assertEquals(
expected = FOS_ALLOWMULTISELECT or FOS_FORCEFILESYSTEM,
actual = requiredFileDialogOptions(FOS_ALLOWMULTISELECT),
)
}
}