Modern Themes

Flow.Launcher.Core/Resource/Theme.cs

@@ -145,11 +145,9 @@ private ResourceDictionary CurrentThemeResourceDictionary()
         public ResourceDictionary GetResourceDictionary()
         {
             var dict = CurrentThemeResourceDictionary();
-
-            Style queryBoxStyle = dict["QueryBoxStyle"] as Style;
-            Style querySuggestionBoxStyle = dict["QuerySuggestionBoxStyle"] as Style;
-
-            if (queryBoxStyle != null && querySuggestionBoxStyle != null)
+
+            if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
+                dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
                 var fontFamily = new FontFamily(Settings.QueryBoxFont);
                 var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.QueryBoxFontStyle);
@@ -174,19 +172,19 @@ public ResourceDictionary GetResourceDictionary()
                 querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, fontStretch));
             }
 
-            Style resultItemStyle = dict["ItemTitleStyle"] as Style;
-            Style resultSubItemStyle = dict["ItemSubTitleStyle"] as Style;
-            Style resultItemSelectedStyle = dict["ItemTitleSelectedStyle"] as Style;
-            Style resultSubItemSelectedStyle = dict["ItemSubTitleSelectedStyle"] as Style;
-            if (resultItemStyle != null && resultSubItemStyle != null && resultSubItemSelectedStyle != null && resultItemSelectedStyle != null)
+            if (dict["ItemTitleStyle"] is Style resultItemStyle &&
+                dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&
+                dict["ItemSubTitleSelectedStyle"] is Style resultSubItemSelectedStyle &&
+                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
+                dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
             {
                 Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(Settings.ResultFont));
                 Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.ResultFontStyle));
                 Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(Settings.ResultFontWeight));
                 Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.ResultFontStretch));
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
-                Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
+                Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
             var windowStyle = dict["WindowStyle"] as Style;
@@ -236,17 +234,19 @@ private string GetThemePath(string themeName)
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            var dict = CurrentThemeResourceDictionary();
+            var dict = GetResourceDictionary();
 
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
-            var effectSetter = new Setter();
-            effectSetter.Property = Border.EffectProperty;
-            effectSetter.Value = new DropShadowEffect
+            var effectSetter = new Setter
             {
-                Opacity = 0.9,
-                ShadowDepth = 2,
-                BlurRadius = 15
+                Property = Border.EffectProperty,
+                Value = new DropShadowEffect
+                {
+                    Opacity = 0.4,
+                    ShadowDepth = 2,
+                    BlurRadius = 15
+                }
             };
 
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
@@ -261,7 +261,7 @@ public void AddDropShadowEffectToCurrentTheme()
             }
             else
             {
-                var baseMargin = (Thickness) marginSetter.Value;
+                var baseMargin = (Thickness)marginSetter.Value;
                 var newMargin = new Thickness(
                     baseMargin.Left + ShadowExtraMargin,
                     baseMargin.Top + ShadowExtraMargin,
@@ -282,8 +282,8 @@ public void RemoveDropShadowEffectFromCurrentTheme()
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
-            
-            if(effectSetter != null)
+
+            if (effectSetter != null)
             {
                 windowBorderStyle.Setters.Remove(effectSetter);
             }
@@ -371,11 +371,11 @@ private bool IsBlurTheme()
         private void SetWindowAccent(Window w, AccentState state)
         {
             var windowHelper = new WindowInteropHelper(w);
-            
+
             // this determines the width of the main query window
             w.Width = mainWindowWidth;
             windowHelper.EnsureHandle();
-            
+
             var accent = new AccentPolicy { AccentState = state };
             var accentStructSize = Marshal.SizeOf(accent);
 

Flow.Launcher/Converters/BorderClipConverter.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Documents;
+using System.Windows.Shapes;
+
+// For Clipping inside listbox item
+
+namespace Flow.Launcher.Converters
+{
+    public class BorderClipConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length == 3 && values[0] is double && values[1] is double && values[2] is CornerRadius)
+            {
+                var width = (double)values[0];
+                var height = (double)values[1];
+                Path myPath = new Path();
+                if (width < Double.Epsilon || height < Double.Epsilon)
+                {
+                    return Geometry.Empty;
+                }                
+                var radius = (CornerRadius)values[2];
+                var radiusHeight = radius.TopLeft;
+
+                // Drawing Round box for bottom round, and rect for top area of listbox.
+                var corner = new RectangleGeometry(new Rect(0, 0, width, height), radius.TopLeft, radius.TopLeft);
+                var box = new RectangleGeometry(new Rect(0, 0, width, radiusHeight), 0, 0);
+
+                GeometryGroup myGeometryGroup = new GeometryGroup();
+                myGeometryGroup.Children.Add(corner);
+                myGeometryGroup.Children.Add(box);
+
+                CombinedGeometry c1 = new CombinedGeometry(GeometryCombineMode.Union, corner, box);
+                myPath.Data = c1;
+
+                myPath.Data.Freeze();
+                return myPath.Data;
+            }
+
+            return DependencyProperty.UnsetValue;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+
+}

Flow.Launcher/Converters/HighlightTextConverter.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 using System.Windows.Documents;
 
 namespace Flow.Launcher.Converters
@@ -30,7 +31,9 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
                 var currentCharacter = text.Substring(i, 1);
                 if (this.ShouldHighlight(highlightData, i))
                 {
-                    textBlock.Inlines.Add(new Bold(new Run(currentCharacter)));
+
+                    textBlock.Inlines.Add(new Run(currentCharacter) { Style = (Style)Application.Current.FindResource("HighlightStyle") });
+
                 }
                 else
                 {

Flow.Launcher/Flow.Launcher.csproj

@@ -48,6 +48,7 @@
 
   <ItemGroup>
     <Page Remove="Themes\ThemeBuilder\Template.xaml" />
+    <Resource Include="resources\Segoe Fluent Icons.ttf" />  
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/HotkeyControl.xaml

@@ -9,11 +9,11 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
             <ColumnDefinition Width="125" />
+            <ColumnDefinition Width="160" />
         </Grid.ColumnDefinitions>
-        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="0"
-                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" input:InputMethod.IsInputMethodEnabled="False"/>
-        <TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="5 0 0 0" VerticalAlignment="Center" Grid.Column="1" />
+        <TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="8 0 0 0" VerticalAlignment="Center" Grid.Column="0" HorizontalAlignment="Right"/>
+        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="1"
+                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" input:InputMethod.IsInputMethodEnabled="False" Margin="5 0 18 0"/>
     </Grid>
 </UserControl>

Flow.Launcher/MainWindow.xaml

@@ -30,6 +30,7 @@
         d:DataContext="{d:DesignInstance vm:MainViewModel}">
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter"/>
+        <converters:BorderClipConverter x:Key="BorderClipConverter"/>
     </Window.Resources>
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
@@ -45,6 +46,8 @@
         <KeyBinding Key="U" Modifiers="Ctrl" Command="{Binding SelectPrevPageCommand}"></KeyBinding>
         <KeyBinding Key="Home" Modifiers="Alt" Command="{Binding SelectFirstResultCommand}"></KeyBinding>
         <KeyBinding Key="O" Modifiers="Ctrl" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
+        <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
+        <KeyBinding Key="Left" Command="{Binding EscCommand}"></KeyBinding>
         <KeyBinding Key="H" Modifiers="Ctrl" Command="{Binding LoadHistoryCommand}"></KeyBinding>
         <KeyBinding Key="Enter" Modifiers="Ctrl+Shift" Command="{Binding OpenResultCommand}"></KeyBinding>
         <KeyBinding Key="Enter" Modifiers="Shift" Command="{Binding LoadContextMenuCommand}"></KeyBinding>
@@ -62,13 +65,12 @@
         <KeyBinding Key="D9" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="8"></KeyBinding>
     </Window.InputBindings>
     <Grid>
-        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown" CornerRadius="5" >
+        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
             <StackPanel Orientation="Vertical">
                 <Grid>
                     <TextBox x:Name="QueryTextSuggestionBox"
                          Style="{DynamicResource QuerySuggestionBoxStyle}"
-                         IsEnabled="False"
-                         Margin="18,0,56,0">
+                         IsEnabled="False">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
                                 <Binding ElementName="QueryTextBox" Path="Text"/>
@@ -82,34 +84,67 @@
                      PreviewDragOver="OnPreviewDragOver"
                      AllowDrop="True"
                      Visibility="Visible"
-                    Background="Transparent"
-                    Margin="18,0,56,0">
+                    Background="Transparent">
                         <TextBox.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="ApplicationCommands.Cut"/>
                                 <MenuItem Command="ApplicationCommands.Copy"/>
                                 <MenuItem Command="ApplicationCommands.Paste"/>
                                 <Separator />
-                                <MenuItem Header="Settings" Click="OnContextMenusForSettingsClick" />
+                                <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
+                                <MenuItem Command="{Binding EscCommand}" Header="Close"/>
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
-                    <svgc:SvgControl Source="{Binding Image}" HorizontalAlignment="Right" Width="42" Height="42"
-                                     Background="Transparent"/>
+                    <Canvas Style="{DynamicResource SearchIconPosition}">
+                        <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                    </Canvas>
                 </Grid>
-                <Line x:Name="ProgressBar" HorizontalAlignment="Right"
+
+                <Grid>
+                    <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
+                    <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                   Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                  Y1="0" Y2="0" X2="100" Height="2" Width="752" StrokeThickness="1">
-                </Line>
-                <ContentControl>
-                    <flowlauncher:ResultListBox x:Name="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
-                </ContentControl>
-                <ContentControl>
-                    <flowlauncher:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" />
-                </ContentControl>
-                <ContentControl>
-                    <flowlauncher:ResultListBox DataContext="{Binding History}" PreviewMouseDown="OnPreviewMouseButtonDown" />
-                </ContentControl>
+                  Y1="0" Y2="0" X1="0" X2="100" Height="2" Width="752" StrokeThickness="1">
+                    </Line>
+                </Grid>
+
+                <Border 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>
+                    <ContentControl>
+                        <flowlauncher:ResultListBox x:Name="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
+                    </ContentControl>
+                </Border>
+                <Border 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>
+                     <ContentControl>
+                        <flowlauncher:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="ContextMenu"/>
+                      </ContentControl>
+                </Border>
+                <Border 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>
+                        <ContentControl>
+                        <flowlauncher:ResultListBox DataContext="{Binding History}" PreviewMouseDown="OnPreviewMouseButtonDown" x:Name="History"/>
+                         </ContentControl>
+                </Border>
             </StackPanel>
         </Border>
     </Grid>

Flow.Launcher/MainWindow.xaml.cs

@@ -313,25 +313,43 @@ private double WindowTop()
         /// </summary>
         private void OnKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.Down)
+            switch (e.Key)
             {
-                _viewModel.SelectNextItemCommand.Execute(null);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Up)
-            {
-                _viewModel.SelectPrevItemCommand.Execute(null);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.PageDown)
-            {
-                _viewModel.SelectNextPageCommand.Execute(null);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.PageUp)
-            {
-                _viewModel.SelectPrevPageCommand.Execute(null);
-                e.Handled = true;
+                case Key.Down:
+                    _viewModel.SelectNextItemCommand.Execute(null);
+                    e.Handled = true;
+                    break;
+                case Key.Up:
+                    _viewModel.SelectPrevItemCommand.Execute(null);
+                    e.Handled = true;
+                    break;
+                case Key.PageDown:
+                    _viewModel.SelectNextPageCommand.Execute(null);
+                    e.Handled = true;
+                    break;
+                case Key.PageUp:
+                    _viewModel.SelectPrevPageCommand.Execute(null);
+                    e.Handled = true;
+                    break;
+                case Key.Right:
+                    if (_viewModel.SelectedIsFromQueryResults()
+                        && QueryTextBox.CaretIndex == QueryTextBox.Text.Length
+                        && !string.IsNullOrEmpty(QueryTextBox.Text))
+                    {
+                        _viewModel.LoadContextMenuCommand.Execute(null);
+                        e.Handled = true;
+                    }
+                    break;
+                case Key.Left:
+                    if (!_viewModel.SelectedIsFromQueryResults() && QueryTextBox.CaretIndex == 0)
+                    {
+                        _viewModel.EscCommand.Execute(null);
+                        e.Handled = true;
+                    }
+                    break;
+                default:
+                    break;
+
             }
         }