Skip to content

Commit e168984

Browse files
committed
Resolve conflicts
1 parent 3282b02 commit e168984

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Flow.Launcher.Infrastructure/Win32Helper.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,20 @@ public static void EnableWin32DarkMode(string colorScheme)
908908

909909
#endregion
910910

911+
#region File / Folder Dialog
912+
913+
public static string SelectFile()
914+
{
915+
var dlg = new OpenFileDialog();
916+
var result = dlg.ShowDialog();
917+
if (result == true)
918+
return dlg.FileName;
919+
920+
return string.Empty;
921+
}
922+
923+
#endregion
924+
911925
#region Administrator Mode
912926

913927
public static bool IsAdministrator()
@@ -1066,19 +1080,5 @@ public static unsafe bool RunAsDesktopUser(string app, string currentDir, string
10661080
}
10671081

10681082
#endregion
1069-
1070-
#region File / Folder Dialog
1071-
1072-
public static string SelectFile()
1073-
{
1074-
var dlg = new OpenFileDialog();
1075-
var result = dlg.ShowDialog();
1076-
if (result == true)
1077-
return dlg.FileName;
1078-
1079-
return string.Empty;
1080-
}
1081-
1082-
#endregion
10831083
}
10841084
}

0 commit comments

Comments
 (0)