From 587536f0f5edb5a222e66839f6818bdc71779459 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 28 May 2024 21:38:02 +1000 Subject: [PATCH] updated PreviewVisible logic to base on ResultAreaColumn size --- Flow.Launcher/ViewModel/MainViewModel.cs | 36 +++++++++++++++--------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index c408a5176..c58aa9c72 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -572,25 +572,35 @@ namespace Flow.Launcher.ViewModel public string Image => Constant.QueryTextBoxIconImagePath; public bool StartWithEnglishMode => Settings.AlwaysStartEn; - - public bool PreviewVisible { get; set; } = false; - - public int ResultAreaColumn { get; set; } = 1; - + #endregion #region Preview - // Not accurate - public bool ExternalPreviewOpen { get; set; } = false; - - [RelayCommand] - private void TogglePreview() + public bool InternalPreviewVisible { - if (PreviewVisible) + get { - // To deal with always preview - HideInternalPreview(); + if (ResultAreaColumn == ResultAreaColumnPreviewShown) + return true; + + if (ResultAreaColumn == ResultAreaColumnPreviewHidden) + return false; +#if DEBUG + throw new NotImplementedException("ResultAreaColumn should match ResultAreaColumnPreviewShown/ResultAreaColumnPreviewHidden value"); +#else + Log.Error("MainViewModel", "ResultAreaColumnPreviewHidden/ResultAreaColumnPreviewShown int value not implemented", "InternalPreviewVisible"); +#endif + return false; + } + } + + private static readonly int ResultAreaColumnPreviewShown = 1; + + private static readonly int ResultAreaColumnPreviewHidden = 3; + + public int ResultAreaColumn { get; set; } = ResultAreaColumnPreviewShown; + } else if(Settings.UseExternalPreview && CanExternalPreviewSelectedResult(out var path)) {