Skip to content

Commit 9bcb1b2

Browse files
committed
Merge branch 'Calculator-accepts-flexible-separator' of https://github.com/dcog989/Flow.Launcher into Calculator-accepts-flexible-separator
2 parents 76f834f + e1150a4 commit 9bcb1b2

File tree

4 files changed

+7
-364
lines changed

4 files changed

+7
-364
lines changed

Flow.Launcher.Core/packages.lock.json

Lines changed: 0 additions & 260 deletions
This file was deleted.

Flow.Launcher.Plugin/packages.lock.json

Lines changed: 0 additions & 77 deletions
This file was deleted.

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -501,15 +501,14 @@ private async Task OpenResultAsync(string index)
501501
// For Dialog Jump and left click mode, we need to navigate to the path
502502
if (_isDialogJump && Settings.DialogJumpResultBehaviour == DialogJumpResultBehaviours.LeftClick)
503503
{
504-
Hide();
505-
506-
if (SelectedResults.SelectedItem != null && DialogWindowHandle != nint.Zero)
504+
if (result is DialogJumpResult dialogJumpResult)
507505
{
508-
if (result is DialogJumpResult dialogJumpResult)
509-
{
510-
Win32Helper.SetForegroundWindow(DialogWindowHandle);
511-
_ = Task.Run(() => DialogJump.JumpToPathAsync(DialogWindowHandle, dialogJumpResult.DialogJumpPath));
512-
}
506+
Win32Helper.SetForegroundWindow(DialogWindowHandle);
507+
_ = Task.Run(() => DialogJump.JumpToPathAsync(DialogWindowHandle, dialogJumpResult.DialogJumpPath));
508+
}
509+
else
510+
{
511+
App.API.LogError(ClassName, "DialogJumpResult expected but got a different result type.");
513512
}
514513
}
515514
// For query mode, we execute the result

Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)