Merge branch 'dev' into l10n_dev

Flow-Launcher · Jun 19, 2024 · a3561ea · a3561ea
2 parents d959f80 + f51a14d
commit a3561ea
Show file tree

Hide file tree

Showing 8 changed files with 721 additions and 56 deletions.
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
@@ -62,13 +62,13 @@
                         <StackPanel
                             x:Name="HotkeyArea"
                             Grid.Column="2"
-                            Margin="0,0,10,0"
+                            Margin="0 0 10 0"
                             VerticalAlignment="Center"
                             Visibility="{Binding ShowOpenResultHotkey}">
                             <TextBlock
                                 x:Name="Hotkey"
-                                Margin="12,0,12,0"
-                                Padding="0,0,0,0"
+                                Margin="12 0 12 0"
+                                Padding="0 0 0 0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Style="{DynamicResource ItemHotkeyStyle}">
@@ -97,17 +97,18 @@
 
                             <Border
                                 Grid.Column="1"
-                                Margin="9,0,0,0"
+                                Margin="9 0 0 0"
                                 BorderBrush="Transparent"
                                 BorderThickness="1">
                                 <Image
                                     x:Name="ImageIcon"
-                                    Margin="0,0,0,0"
+                                    Margin="0 0 0 0"
                                     HorizontalAlignment="Center"
                                     IsHitTestVisible="False"
                                     RenderOptions.BitmapScalingMode="Fant"
                                     Source="{Binding Image, TargetNullValue={x:Null}}"
                                     Stretch="Uniform"
+                                    StretchDirection="DownOnly"
                                     Style="{DynamicResource ImageIconStyle}"
                                     Visibility="{Binding ShowIcon}">
                                     <Image.Clip>
@@ -130,7 +131,7 @@
                             </Border>
                             <Border
                                 Grid.Column="1"
-                                Margin="9,0,0,0"
+                                Margin="9 0 0 0"
                                 BorderBrush="Transparent"
                                 BorderThickness="0">
                                 <TextBlock
@@ -146,7 +147,7 @@
 
                         <Grid
                             Grid.Column="1"
-                            Margin="6,0,10,0"
+                            Margin="6 0 10 0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center">
                             <Grid.RowDefinitions>
@@ -172,7 +173,7 @@
                             <TextBlock
                                 x:Name="Title"
                                 Grid.Row="0"
-                                Margin="0,0,0,1"
+                                Margin="0 0 0 1"
                                 VerticalAlignment="Bottom"
                                 DockPanel.Dock="Left"
                                 FontSize="{Binding Settings.ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
@@ -192,7 +193,7 @@
                             <TextBlock
                                 x:Name="SubTitle"
                                 Grid.Row="1"
-                                Margin="0,1,0,0"
+                                Margin="0 1 0 0"
                                 VerticalAlignment="Top"
                                 FontSize="{Binding Settings.ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
@@ -221,9 +222,10 @@
     <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Height" Value="{Binding Settings.ItemHeightSize}" />
+            <Setter Property="Visibility" Value="Visible" />
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
             <EventSetter Event="MouseMove" Handler="OnMouseMove" />
-            <Setter Property="Height" Value="{Binding Settings.ItemHeightSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="Padding" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
@@ -256,4 +258,4 @@
             </Setter>
         </Style>
     </ListBox.ItemContainerStyle>
-</ListBox>
+</ListBox>
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
@@ -169,7 +169,7 @@
         <Setter Property="FontSize" Value="25" />
     </Style>
     <CornerRadius x:Key="ItemRadius">5</CornerRadius>
-    <Thickness x:Key="ItemMargin">10 0 5 0</Thickness>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
     <Thickness x:Key="ResultMargin">0 10 0 10</Thickness>
     <Style
         x:Key="ClockPanel"

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -9,6 +9,7 @@
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 using System.Linq;
+using Flow.Launcher.Plugin.Explorer.Helper;
 using MessageBox = System.Windows.Forms.MessageBox;
 using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon;
 using MessageBoxButton = System.Windows.Forms.MessageBoxButtons;
@@ -252,6 +253,45 @@ public List<Result> LoadContextMenus(Result selectedResult)
                         IcoPath = Constants.DifferentUserIconImagePath,
                         Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue748"),
                     });
+
+                if (record.Type is ResultType.File or ResultType.Folder && Settings.ShowInlinedWindowsContextMenu)
+                {
+                    var includedItems = Settings
+                        .WindowsContextMenuIncludedItems
+                        .Replace("\r", "")
+                        .Split("\n")
+                        .Where(v => !string.IsNullOrWhiteSpace(v))
+                        .ToArray();
+                    var excludedItems = Settings
+                        .WindowsContextMenuExcludedItems
+                        .Replace("\r", "")
+                        .Split("\n")
+                        .Where(v => !string.IsNullOrWhiteSpace(v))
+                        .ToArray();
+                    var menuItems = ShellContextMenuDisplayHelper
+                        .GetContextMenuWithIcons(record.FullPath)
+                        .Where(contextMenuItem =>
+                            (includedItems.Length == 0 || includedItems.Any(filter =>
+                                contextMenuItem.Label.Contains(filter, StringComparison.OrdinalIgnoreCase)
+                            )) &&
+                            (excludedItems.Length == 0 || !excludedItems.Any(filter =>
+                                contextMenuItem.Label.Contains(filter, StringComparison.OrdinalIgnoreCase)
+                            ))
+                        );
+                    foreach (var menuItem in menuItems)
+                    {
+                        contextMenus.Add(new Result
+                        {
+                            Title = menuItem.Label,
+                            Icon = () => menuItem.Icon,
+                            Action = _ =>
+                            {
+                                ShellContextMenuDisplayHelper.ExecuteContextMenuItem(record.FullPath, menuItem.CommandId);
+                                return true;
+                            }
+                        });
+                    }
+                }
             }
 
             return contextMenus;