diff --git a/EverythingToolbar.App/ToolbarSettings.cs b/EverythingToolbar.App/ToolbarSettings.cs index 767a9914a..09ef7098b 100644 --- a/EverythingToolbar.App/ToolbarSettings.cs +++ b/EverythingToolbar.App/ToolbarSettings.cs @@ -107,6 +107,9 @@ public interface IToolbarSettings [Option(DefaultValue = false)] bool IsPreviewPaneEnabled { get; set; } + [Option(DefaultValue = 380)] + int PreviewPaneWidth { get; set; } + [Option(DefaultValue = "")] string InstanceName { get; set; } diff --git a/EverythingToolbar/SearchWindow.xaml b/EverythingToolbar/SearchWindow.xaml index 740ea5e51..b4748fdcb 100644 --- a/EverythingToolbar/SearchWindow.xaml +++ b/EverythingToolbar/SearchWindow.xaml @@ -64,7 +64,10 @@ - + @@ -72,14 +75,16 @@ - + + + + + + + + + (); public SearchWindow(SearchWindowViewModel viewModel, SearchWindowController controller) : base(viewModel.ThemeService, viewModel.WindowsPolicy) @@ -43,6 +48,7 @@ public SearchWindow(SearchWindowViewModel viewModel, SearchWindowController cont _viewModel = viewModel; _controller = controller; InitializeComponent(); + PreviewPane.Width = _settings.PreviewPaneWidth; _animator = new SearchWindowAnimator( this, @@ -82,6 +88,30 @@ private void OnLostKeyboardFocus(object? sender, KeyboardFocusChangedEventArgs e } } + private void OnPreviewPaneResize(object sender, DragDeltaEventArgs e) + { + // The handle is on the side facing the results, so dragging toward them makes the pane wider. + SetPreviewPaneWidth(PreviewPane.Width - e.HorizontalChange); + } + + private void OnPreviewPaneResizeCompleted(object sender, DragCompletedEventArgs e) + { + _settings.PreviewPaneWidth = (int)Math.Round(PreviewPane.Width); + } + + // Keep room for the results when the window gets smaller. The saved width is left alone, so the pane + // grows back once there is space again. + private void OnResultsGridSizeChanged(object sender, SizeChangedEventArgs e) + { + SetPreviewPaneWidth(_settings.PreviewPaneWidth); + } + + private void SetPreviewPaneWidth(double width) + { + double max = ResultsGrid.ActualWidth - MinResultsWidth; + PreviewPane.Width = Math.Max(MinPreviewPaneWidth, Math.Min(width, max)); + } + private void OpenSearchInEverything(object? sender, RoutedEventArgs e) { _viewModel.OpenSearchInEverything();