Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 37 additions & 6 deletions Flow.Launcher/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
</Window.Resources>
<Window.InputBindings>
<KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
<KeyBinding Key="F1" Command="{Binding StartHelpCommand}"></KeyBinding>
<KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}"></KeyBinding>
<KeyBinding Key="Tab" Command="{Binding SelectNextItemCommand}"></KeyBinding>
<KeyBinding Key="Tab" Modifiers="Shift" Command="{Binding SelectPrevItemCommand}"></KeyBinding>
Expand Down Expand Up @@ -108,7 +107,39 @@
Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
</Line>
</Grid>

<Border MinHeight="230" Visibility="Collapsed" x:Name="QuickPreview" Margin="0 0 0 0" HorizontalAlignment="Left" BorderThickness="1" BorderBrush="#00000000">

<DockPanel DataContext="{Binding SelectedItem, ElementName=ResultListBox}" VerticalAlignment="Stretch">
<Border HorizontalAlignment="Stretch" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Border}},Path=ActualWidth}" DockPanel.Dock="Bottom">
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource QuickViewSeparatorStyle}"/>
</Border>
<Border BorderThickness="0" BorderBrush="#000000" Margin="20 18 20 22" VerticalAlignment="Center" HorizontalAlignment="Stretch" DockPanel.Dock="Top">
<Grid HorizontalAlignment="Stretch">
<StackPanel HorizontalAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Image Grid.Row="0" Grid.Column="0" MaxHeight="200" Height="64" x:Name="ImageIcon" Width="64" HorizontalAlignment="Center" Source="{Binding Image}" Visibility="{Binding ShowIcon}" Margin="0 0 0 8" Stretch="UniformToFill"/>
<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Glyph.Glyph}" FontFamily="{Binding Glyph.FontFamily}" Visibility="{Binding ShowGlyph}" Style="{DynamicResource ItemGlyph}" FontSize="64" Width="64" Height="64" Margin="0 0 0 6"/>

<TextBlock Grid.Row="1" x:Name="Title" Text="{Binding Result.Title}" FontSize="18" TextAlignment="Center" FontWeight="SemiBold" Style="{DynamicResource ItemTitleStyle}" TextWrapping="Wrap" HorizontalAlignment="Stretch">
</TextBlock>
<TextBlock Grid.Row="2" x:Name="SubTitle" Text="{Binding Result.SubTitle}" TextAlignment="Center" FontSize="15" Style="{DynamicResource ItemSubTitleStyle}" TextWrapping="Wrap" HorizontalAlignment="Stretch" Margin="0 4 0 0"></TextBlock>
</Grid>
</StackPanel>
</Grid>

</Border>

</DockPanel>

</Border>
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
Expand All @@ -134,16 +165,16 @@
</ContentControl>
</Border>
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<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>
<ContentControl>
</Border.Clip>
<ContentControl>
<flowlauncher:ResultListBox DataContext="{Binding History}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="History"/>
</ContentControl>
</ContentControl>
</Border>
</StackPanel>
</Border>
Expand Down
21 changes: 21 additions & 0 deletions Flow.Launcher/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MessageBox = System.Windows.MessageBox;
using NotifyIcon = System.Windows.Forms.NotifyIcon;
using System.Globalization;

namespace Flow.Launcher
{
Expand All @@ -34,6 +35,8 @@ public partial class MainWindow

#endregion



public MainWindow(Settings settings, MainViewModel mainVM)
{
DataContext = mainVM;
Expand Down Expand Up @@ -347,6 +350,10 @@ private void OnKeyDown(object sender, KeyEventArgs e)
e.Handled = true;
}
break;
case Key.F1:
QuickPreviewToggle();
e.Handled = true;
break;
default:
break;

Expand All @@ -357,5 +364,19 @@ private void MoveQueryTextToEnd()
{
QueryTextBox.CaretIndex = QueryTextBox.Text.Length;
}

public void QuickPreviewToggle()
{

if (QuickPreview.Visibility == Visibility.Collapsed)
{
QuickPreview.Visibility = Visibility.Visible;
}
else
{
QuickPreview.Visibility = Visibility.Collapsed;
}
}

}
}
2 changes: 1 addition & 1 deletion Flow.Launcher/ResultListBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard"
SelectionChanged="OnSelectionChanged"
IsSynchronizedWithCurrentItem="True"
PreviewMouseDown="ListBox_PreviewMouseDown">
PreviewMouseDown="ListBox_PreviewMouseDown" Name="ResultList">
<!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083-->

<ListBox.ItemTemplate>
Expand Down
8 changes: 7 additions & 1 deletion Flow.Launcher/ResultListBox.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,26 @@ namespace Flow.Launcher
{
public partial class ResultListBox
{
public ICommand SelectionChangedCommand { get; set; }

protected object _lock = new object();
private Point _lastpos;
private ListBoxItem curItem = null;

public ResultListBox()
{
InitializeComponent();
}

private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
public void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{

if (e.AddedItems.Count > 0 && e.AddedItems[0] != null)
{
ScrollIntoView(e.AddedItems[0]);
}


}

private void OnMouseEnter(object sender, MouseEventArgs e)
Expand Down
28 changes: 28 additions & 0 deletions Flow.Launcher/Themes/Base.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding ElementName=QuickPreview, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
Expand All @@ -240,6 +243,22 @@
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="BaseQuickViewSeparatorStyle" TargetType="Rectangle">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
</Style.Triggers>
</Style>

<Style x:Key="HighlightStyle">
<Setter Property="Inline.FontWeight" Value="Bold" />
</Style>
Expand Down Expand Up @@ -293,5 +312,14 @@
<Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" />
</Style>
<Style x:Key="QuickViewSeparatorStyle" TargetType="Rectangle" BasedOn="{StaticResource BaseQuickViewSeparatorStyle}">
<Setter Property="Fill" Value="Transparent"/>
<Setter Property="Height" Value="0"/>
<Setter Property="Margin" Value="0 0 0 0"/>
</Style>
<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="Transparent"/>
<Setter Property="Height" Value="0"/>
</Style>
</ResourceDictionary>

5 changes: 5 additions & 0 deletions Flow.Launcher/Themes/Sublime.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="0 0 0 8"/>
</Style>
<Style x:Key="QuickViewSeparatorStyle" TargetType="Rectangle" BasedOn="{StaticResource BaseQuickViewSeparatorStyle}">
<Setter Property="Fill" Value="#3c454e"/>
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="0 0 0 0"/>
</Style>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
<Setter Property="Fill" Value="#3c454e" />
<Setter Property="Width" Value="32" />
Expand Down
5 changes: 5 additions & 0 deletions Flow.Launcher/Themes/Win10Light.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="12 0 12 8"/>
</Style>
<Style x:Key="QuickViewSeparatorStyle" TargetType="Rectangle" BasedOn="{StaticResource BaseQuickViewSeparatorStyle}">
<Setter Property="Fill" Value="#c6c6c6"/>
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="12 0 12 8"/>
</Style>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
<Setter Property="Fill" Value="#555555" />
<Setter Property="Width" Value="32" />
Expand Down