Skip to content

Support Preview Panel for History Results #3370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Mar 26, 2025
Merged

Support Preview Panel for History Results #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9167cba
Use selected item for binding preview properties & Code cleanup
Jack251970 Mar 22, 2025
b93faff
Code cleanup
Jack251970 Mar 22, 2025
26ab2ae
Revert to results selected item
Jack251970 Mar 22, 2025
f1bcfc1
Support preview panel for history
Jack251970 Mar 22, 2025
3c7b8cf
Force preview panel height
Jack251970 Mar 22, 2025
00ac327
Fix history visibility issue
Jack251970 Mar 22, 2025
655b017
Code quality
Jack251970 Mar 22, 2025
e9f317f
Change variable names
Jack251970 Mar 23, 2025
07b73db
Add preview info for history results
Jack251970 Mar 25, 2025
835457d
Remove debug codes
Jack251970 Mar 25, 2025
3acfebc
Fix possible visibility issue
Jack251970 Mar 25, 2025
0d74048
Add control names
Jack251970 Mar 25, 2025
acf3a27
Improve code quality
Jack251970 Mar 26, 2025
8e5412f
Fix preview panel display when only enabling history
Jack251970 Mar 26, 2025
f7954a0
Clean debug codes
Jack251970 Mar 26, 2025
9741156
Improve code quality
Jack251970 Mar 26, 2025
d73980a
Merge branch 'dev' into history_preview1
Jack251970 Mar 26, 2025
66e42c1
Add control names
Jack251970 Mar 26, 2025
65f07d8
Fix preview sepatator issue
Jack251970 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Flow.Launcher.Infrastructure/Constant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public static class Constant
public static readonly string MissingImgIcon = Path.Combine(ImagesDirectory, "app_missing_img.png");
public static readonly string LoadingImgIcon = Path.Combine(ImagesDirectory, "loading.png");
public static readonly string ImageIcon = Path.Combine(ImagesDirectory, "image.png");
public static readonly string HistoryIcon = Path.Combine(ImagesDirectory, "history.png");

public static string PythonPath;
public static string NodePath;
Expand Down
17 changes: 11 additions & 6 deletions Flow.Launcher/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@

<Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
<StackPanel Orientation="Vertical">
<Grid>
<Grid x:Name="QueryBoxArea">
<Border MinHeight="30" Style="{DynamicResource QueryBoxBgStyle}">
<Grid>
<TextBox
Expand Down Expand Up @@ -338,7 +338,7 @@
Y2="0" />
</Grid>

<Grid ClipToBounds="True">
<Grid x:Name="MiddleSeparatorArea" ClipToBounds="True">
<ContentControl>
<ContentControl.Style>
<Style TargetType="ContentControl">
Expand Down Expand Up @@ -378,20 +378,22 @@
</ContentControl>
</Grid>

<Border Style="{DynamicResource WindowRadius}">
<Border x:Name="ResultPreviewAreaBoarder" Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
</MultiBinding>
</Border.Clip>
<Grid>

<Grid x:Name="ResultPreviewArea">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="80" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="0.85*" MinWidth="244" />
</Grid.ColumnDefinitions>

<StackPanel
x:Name="ResultArea"
Grid.Column="0"
Expand All @@ -418,7 +420,9 @@
RightClickResultCommand="{Binding RightClickResultCommand}" />
</ContentControl>
</StackPanel>

<GridSplitter
x:Name="PreviewMiddleSeparator"
Grid.Column="1"
Margin="0"
HorizontalAlignment="Center"
Expand All @@ -432,6 +436,7 @@
</ControlTemplate>
</GridSplitter.Template>
</GridSplitter>

<Grid
x:Name="Preview"
Grid.Column="2"
Expand All @@ -441,7 +446,7 @@
<Border
MinHeight="380"
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
DataContext="{Binding PreviewSelectedItem, Mode=OneWay}"
Visibility="{Binding ShowDefaultPreview}">
<Grid
Margin="0 0 10 5"
Expand Down Expand Up @@ -518,7 +523,7 @@
MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
Padding="0 0 10 10"
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
DataContext="{Binding PreviewSelectedItem, Mode=OneWay}"
Visibility="{Binding ShowCustomizedPreview}">
<ContentControl Content="{Binding Result.PreviewPanel.Value}" />
</Border>
Expand Down
6 changes: 3 additions & 3 deletions Flow.Launcher/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
e.Handled = true;
break;
case Key.Right:
if (_viewModel.SelectedIsFromQueryResults()
if (_viewModel.QueryResultsSelected()
&& QueryTextBox.CaretIndex == QueryTextBox.Text.Length
&& !string.IsNullOrEmpty(QueryTextBox.Text))
{
Expand All @@ -311,7 +311,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)

break;
case Key.Left:
if (!_viewModel.SelectedIsFromQueryResults() && QueryTextBox.CaretIndex == 0)
if (!_viewModel.QueryResultsSelected() && QueryTextBox.CaretIndex == 0)
{
_viewModel.EscCommand.Execute(null);
e.Handled = true;
Expand All @@ -321,7 +321,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
case Key.Back:
if (specialKeyState.CtrlPressed)
{
if (_viewModel.SelectedIsFromQueryResults()
if (_viewModel.QueryResultsSelected()
&& QueryTextBox.Text.Length > 0
&& QueryTextBox.CaretIndex == QueryTextBox.Text.Length)
{
Expand Down
7 changes: 4 additions & 3 deletions Flow.Launcher/Themes/Base.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.Setters>
Expand Down Expand Up @@ -435,12 +436,12 @@
</DataTrigger>
</Style.Triggers>
</Style>

<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="Gray" />

</Style>

<Style x:Key="PreviewArea" TargetType="{x:Type Grid}">
Expand All @@ -450,8 +451,8 @@
<MultiDataTrigger.Conditions>
<!--
<Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />-->
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />-->
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.Setters>
Expand Down
Loading
Loading