Skip to content

Commit 4db994c

Browse files
committed
Prevent customized previews from being created if the preview panel is not visible
1 parent a4d25f4 commit 4db994c

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,8 @@
452452
MinHeight="380"
453453
MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
454454
Padding="0 0 10 10"
455-
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
456-
DataContext="{Binding PreviewSelectedItem, Mode=OneWay}"
457455
Visibility="{Binding ShowCustomizedPreview}">
458-
<ContentControl Content="{Binding Result.PreviewPanel.Value}" />
456+
<ContentControl Content="{Binding CustomizedPreviewControl}" />
459457
</Border>
460458
</Grid>
461459
</Grid>

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Threading.Channels;
99
using System.Threading.Tasks;
1010
using System.Windows;
11+
using System.Windows.Controls;
1112
using System.Windows.Input;
1213
using System.Windows.Media;
1314
using System.Windows.Threading;
@@ -807,6 +808,12 @@ public bool InternalPreviewVisible
807808
}
808809
}
809810

811+
public Visibility ShowCustomizedPreview
812+
=> InternalPreviewVisible && PreviewSelectedItem?.Result.PreviewPanel != null ? Visibility.Visible : Visibility.Collapsed;
813+
814+
public UserControl CustomizedPreviewControl
815+
=> ShowCustomizedPreview == Visibility.Visible ? PreviewSelectedItem?.Result.PreviewPanel.Value : null;
816+
810817
public int ResultAreaColumn { get; set; } = ResultAreaColumnPreviewShown;
811818

812819
// This is not a reliable indicator of whether external preview is visible due to the

Flow.Launcher/ViewModel/ResultViewModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ public ResultViewModel(Result result, Settings settings)
6666

6767
public Visibility ShowDefaultPreview => Result.PreviewPanel == null ? Visibility.Visible : Visibility.Collapsed;
6868

69-
public Visibility ShowCustomizedPreview => Result.PreviewPanel == null ? Visibility.Collapsed : Visibility.Visible;
70-
7169
public Visibility ShowIcon
7270
{
7371
get

0 commit comments

Comments
 (0)