prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updated internal and external preview's show and hide logic

Browse source
This commit is contained in:
Jeremy 2024-05-28 21:41:59 +10:00
parent 587536f0f5
commit 53e4bbb22b
3 changed files with 79 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher/MainWindow.xaml
View file

@ -399,7 +399,7 @@
</StackPanel>
<GridSplitter
Grid.Column="1"
Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}"
Width="{Binding InternalPreviewVisible, Converter={StaticResource SplitterConverter}}"
HorizontalAlignment="Center"
VerticalAlignment="Stretch"
Background="Transparent"
@ -409,7 +409,7 @@
Grid.Column="2"
VerticalAlignment="Stretch"
Style="{DynamicResource PreviewArea}"
Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
Visibility="{Binding InternalPreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
<Border
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
DataContext="{Binding SelectedItem, ElementName=ResultListBox}"

2
Flow.Launcher/MainWindow.xaml.cs
View file

@ -502,7 +502,7 @@ namespace Flow.Launcher
if (_settings.UseAnimation)
await Task.Delay(100);
if (_settings.HideWhenDeactivated && !_viewModel.ExternalPreviewOpen)
if (_settings.HideWhenDeactivated && !_viewModel.ExternalPreviewVisible)
{
_viewModel.Hide();
}

107
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
@ -601,20 +601,57 @@ namespace Flow.Launcher.ViewModel
public int ResultAreaColumn { get; set; } = ResultAreaColumnPreviewShown;
}
else if(Settings.UseExternalPreview && CanExternalPreviewSelectedResult(out var path))
{
_ = ToggleExternalPreviewAsync(path);
}
else
{
// This is not a reliable indicator of whether external preview is visible due to the
// ability of manually closing/exiting the external preview program, and this does not inform flow that
// preview is no longer available.
public bool ExternalPreviewVisible { get; set; } = false;
private void ShowPreview()
{
var useExternalPreview = PluginManager.UseExternalPreview();
if (!useExternalPreview)
ShowInternalPreview();
if (useExternalPreview)
{
// Internal preview may still be on when user switches to external
if (InternalPreviewVisible)
HideInternalPreview();
if (CanExternalPreviewSelectedResult(out var path))
OpenExternalPreview(path);
}
}
private void HidePreview()
{
if (PluginManager.UseExternalPreview())
CloseExternalPreview();
if (InternalPreviewVisible)
HideInternalPreview();
}
[RelayCommand]
private void TogglePreview()
{
switch (InternalPreviewVisible || ExternalPreviewVisible)
{
case true:
HidePreview();
break;
case false:
ShowPreview();
break;
}
}
private void ToggleInternalPreview()
{
if (!PreviewVisible)
if (!InternalPreviewVisible)
{
ShowInternalPreview();
}
@ -643,45 +680,53 @@ namespace Flow.Launcher.ViewModel
private void ShowInternalPreview()
{
ResultAreaColumn = 1;
PreviewVisible = true;
ResultAreaColumn = ResultAreaColumnPreviewShown;
Results.SelectedItem?.LoadPreviewImage();
}
private void HideInternalPreview()
{
ResultAreaColumn = 3;
PreviewVisible = false;
ResultAreaColumn = ResultAreaColumnPreviewHidden;
}
public void ResetPreview()
{
if (Settings.AlwaysPreview == true && !PreviewVisible)
switch (Settings.AlwaysPreview)
{
ShowInternalPreview();
}
else
{
HideInternalPreview();
case true:
ShowPreview();
break;
case false:
HidePreview();
break;
}
}
private void UpdatePreview()
{
if (PreviewVisible)
if (InternalPreviewVisible)
{
Results.SelectedItem?.LoadPreviewImage();
return;
}
else if (Settings.UseExternalPreview)
switch (PluginManager.UseExternalPreview())
{
if (CanExternalPreviewSelectedResult(out var path))
{
_ = SwitchExternalPreviewAsync(path, false);
}
else
{
_ = CloseExternalPreviewAsync();
}
case true
when ExternalPreviewVisible && CanExternalPreviewSelectedResult(out var path):
SwitchExternalPreview(path, false);
break;
case true
when !ExternalPreviewVisible && Settings.AlwaysPreview && CanExternalPreviewSelectedResult(out var path):
ShowPreview();
break;
case true
when !CanExternalPreviewSelectedResult(out var _):
HidePreview();
break;
}
}
@ -1097,8 +1142,8 @@ namespace Flow.Launcher.ViewModel
// Trick for no delay
MainWindowOpacity = 0;
if (Settings.UseExternalPreview)
_ = CloseExternalPreviewAsync();
if (ExternalPreviewVisible)
CloseExternalPreview();
if (!SelectedIsFromQueryResults())
{