Skip to content

Commit 908ed0c

Browse files
authored
Merge pull request #3867 from Flow-Launcher/preview_panel_creation
Do not create customized preview panel when preview is off
2 parents b0694e9 + 14af7af commit 908ed0c

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
@@ -534,10 +534,8 @@
534534
MinHeight="380"
535535
MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
536536
Padding="0 0 10 10"
537-
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
538-
DataContext="{Binding PreviewSelectedItem, Mode=OneWay}"
539537
Visibility="{Binding ShowCustomizedPreview}">
540-
<ContentControl Content="{Binding Result.PreviewPanel.Value}" />
538+
<ContentControl Content="{Binding CustomizedPreviewControl}" />
541539
</Border>
542540
</Grid>
543541
</Grid>

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Threading.Tasks;
1010
using System.Windows;
1111
using System.Windows.Input;
12+
using System.Windows.Controls;
1213
using System.Windows.Media;
1314
using System.Windows.Threading;
1415
using CommunityToolkit.Mvvm.DependencyInjection;
@@ -883,6 +884,12 @@ private ResultsViewModel SelectedResults
883884
}
884885
}
885886

887+
public Visibility ShowCustomizedPreview
888+
=> InternalPreviewVisible && PreviewSelectedItem?.Result.PreviewPanel != null ? Visibility.Visible : Visibility.Collapsed;
889+
890+
public UserControl CustomizedPreviewControl
891+
=> ShowCustomizedPreview == Visibility.Visible ? PreviewSelectedItem?.Result.PreviewPanel.Value : null;
892+
886893
public Visibility ProgressBarVisibility { get; set; }
887894
public Visibility MainWindowVisibility { get; set; }
888895

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)