prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into jsonrpc-v2-close-order

Browse source
This commit is contained in:
Yan 2024-06-06 07:29:00 +06:00 committed by GitHub
commit 697ddbc952
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 189 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/Flow.Launcher.csproj
View file

@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<UseWindowsForms>false</UseWindowsForms>
<StartupObject>Flow.Launcher.App</StartupObject>
<ApplicationIcon>Resources\app.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>

BIN
Flow.Launcher/Images/app_error.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

6
Flow.Launcher/Languages/en.xaml
View file

@ -57,7 +57,7 @@
<system:String x:Key="LastQuerySelected">Select last Query</system:String>
<system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
<system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>
<system:String x:Key="KeepMaxResultsToolTip">The window height will not be resizeable by dragging</system:String>
<system:String x:Key="KeepMaxResultsToolTip">The window height is not adjustable by dragging.</system:String>
<system:String x:Key="maxShowResults">Maximum results shown</system:String>
<system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
<system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
@ -75,6 +75,7 @@
<system:String x:Key="autoUpdates">Auto Update</system:String>
<system:String x:Key="select">Select</system:String>
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
<system:String x:Key="hideOnStartupToolTip">Flow Launcher search window is hidden in the tray after starting up.</system:String>
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
@ -279,6 +280,9 @@
<system:String x:Key="clearlogfolder">Clear Logs</system:String>
<system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
<system:String x:Key="welcomewindow">Wizard</system:String>
<system:String x:Key="userdatapath">User Data Location</system:String>
<system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
<system:String x:Key="userdatapathButton">Open Folder</system:String>
<!-- FileManager Setting Dialog -->
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>

79
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -74,7 +74,8 @@
<Setter Property="BorderThickness" Value="1" />
<Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=WindowState}" Value="Maximized">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="6" />
</DataTrigger>
</Style.Triggers>
</Style>
@ -1642,6 +1643,80 @@
<Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
<Style
x:Key="AccentButtonStyle"
BasedOn="{StaticResource DefaultButtonStyle}"
TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border
x:Name="Background"
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
SnapsToDevicePixels="True">
<Border x:Name="Overlay">
<Border
x:Name="Border"
Margin="1"
Padding="{TemplateBinding Padding}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="0 0 0 1"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
<ContentPresenter
x:Name="ContentPresenter"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
TextElement.Foreground="{TemplateBinding Foreground}" />
</Border>
</Border>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPointerOver}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPressed}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
<Setter TargetName="Overlay" Property="Background" Value="transparent" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}">
<Setter Property="Control.Template">
<Setter.Value>
<ControlTemplate>
<Border
Margin="0"
BorderBrush="{DynamicResource Color05B}"
BorderThickness="2"
CornerRadius="6"
SnapsToDevicePixels="true" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- - Custom Toggle Switch from modern wpf for left label -->
<system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
@ -1657,7 +1732,7 @@
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
<Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
<Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-43,-3,-4,-3" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ui:ToggleSwitch">

15
Flow.Launcher/Resources/Dark.xaml
View file

@ -1605,18 +1605,23 @@
<!-- Resources for AccentButtonStyle -->
<m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="Color01B" />
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="Color01B" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="Color23B" />
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundAltHighBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundListLowBrush" />
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="AccentButtonOverlayPointerOver" />
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="AccentButtonOverlayPressed" />
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
<SolidColorBrush x:Key="AccentButtonOverlayPointerOver" Color="#32555555" />
<SolidColorBrush x:Key="AccentButtonOverlayPressed" Color="#52555555" />
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
<sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>

6
Flow.Launcher/Resources/Light.xaml
View file

@ -1608,9 +1608,11 @@
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemAccentColorDark2Brush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemAccentColorDark2Brush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>

9
Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
View file

@ -80,6 +80,15 @@ public partial class SettingsPaneAboutViewModel : BaseModel
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
}
[RelayCommand]
private void OpenParentOfSettingsFolder(object parameter)
{
string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
PluginManager.API.OpenDirectory(parentFolderPath);
}
[RelayCommand]
private void OpenLogsFolder()
{

44
Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
View file

@ -26,7 +26,6 @@
Text="{DynamicResource about}"
TextAlignment="left" />
<cc:Card
Title="{Binding Version}"
Icon="&#xe946;"
@ -43,7 +42,7 @@
TextDecorations="None">
<TextBlock
Padding="10 5"
Foreground="White"
Foreground="{StaticResource SystemControlForegroundAltHighBrush}"
Text="{DynamicResource BecomeASponsor}" />
</Hyperlink>
</Button>
@ -51,7 +50,18 @@
</cc:Card>
<cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
<cc:HyperLink Uri="{Binding ReleaseNotes}" Text="{DynamicResource releaseNotes}" />
<cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
</cc:Card>
<cc:Card
Title="{DynamicResource userdatapath}"
Margin="0 14 0 0"
Icon="&#xEC25;;"
Sub="{DynamicResource userdatapathToolTip}">
<StackPanel Orientation="Horizontal">
<Button Command="{Binding OpenParentOfSettingsFolderCommand}" Content="{DynamicResource userdatapathButton}" />
</StackPanel>
</cc:Card>
<cc:Card
@ -59,26 +69,26 @@
Margin="0 14 0 0"
Icon="&#xeb41;">
<StackPanel Orientation="Horizontal">
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Website}" Text="{DynamicResource website}" />
<cc:HyperLink Uri="{Binding Github}" Text="{DynamicResource github}" />
<cc:HyperLink
Margin="0 0 12 0"
Text="{DynamicResource website}"
Uri="{Binding Website}" />
<cc:HyperLink
Margin="0 0 12 0"
Text="{DynamicResource documentation}"
Uri="{Binding Documentation}" />
<cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
</StackPanel>
</cc:Card>
<cc:Card Title="{DynamicResource documentation}" Icon="&#xe82f;">
<StackPanel Orientation="Horizontal">
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Documentation}" Text="{DynamicResource documentation}" />
<cc:HyperLink Uri="{Binding Website}" Text="{DynamicResource website}" />
</StackPanel>
<cc:Card Title="{DynamicResource icons}" Icon="&#xE8FE;">
<cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
</cc:Card>
<cc:Card
Title="{DynamicResource icons}"
Margin="0 14 0 0"
Icon="&#xE8FE;">
<cc:HyperLink Uri="https://icons8.com/" Text="icons8.com" />
</cc:Card>
<cc:Card Title="{DynamicResource devtool}" Icon="&#xf12b;">
Title="{DynamicResource devtool}"
Margin="0 12 0 0"
Icon="&#xf12b;">
<StackPanel Orientation="Horizontal">
<Button
Margin="0 0 12 0"

24
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
View file

@ -36,14 +36,17 @@
OnContent="{DynamicResource enable}" />
</cc:Card>
<cc:Card Title="{DynamicResource hideOnStartup}" Icon="&#xed1a;">
<cc:Card
Title="{DynamicResource hideOnStartup}"
Icon="&#xed1a;"
Sub="{DynamicResource hideOnStartupToolTip}">
<ui:ToggleSwitch
IsOn="{Binding Settings.HideOnStartup}"
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</cc:Card>
<cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 30 0 0">
<cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
<ui:ToggleSwitch
IsOn="{Binding Settings.HideWhenDeactivated}"
OffContent="{DynamicResource disable}"
@ -57,7 +60,7 @@
OnContent="{DynamicResource enable}" />
</cc:Card>
<cc:CardGroup Margin="0 30 0 0">
<cc:CardGroup Margin="0 14 0 0">
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
<StackPanel Orientation="Horizontal">
<ComboBox
@ -121,6 +124,7 @@
<cc:Card
Title="{DynamicResource ignoreHotkeysOnFullscreen}"
Margin="0 14 0 0"
Icon="&#xe7fc;"
Sub="{DynamicResource ignoreHotkeysOnFullscreenToolTip}">
<ui:ToggleSwitch
@ -131,7 +135,7 @@
<cc:Card
Title="{DynamicResource AlwaysPreview}"
Margin="0 30 0 0"
Margin="0 14 0 0"
Icon="&#xe8a1;"
Sub="{DynamicResource AlwaysPreviewToolTip}">
<ui:ToggleSwitch
@ -143,7 +147,7 @@
<cc:Card
Title="{DynamicResource autoUpdates}"
Margin="0 30 0 0"
Margin="0 14 0 0"
Icon="&#xecc5;">
<ui:ToggleSwitch
IsOn="{Binding AutoUpdates}"
@ -161,7 +165,7 @@
OnContent="{DynamicResource enable}" />
</cc:Card>
<cc:CardGroup Margin="0 30 0 0">
<cc:CardGroup Margin="0 14 0 0">
<cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
<ComboBox
MaxWidth="200"
@ -182,7 +186,7 @@
<cc:Card
Title="{DynamicResource defaultFileManager}"
Margin="0 30 0 0"
Margin="0 14 0 0"
Icon="&#xe838;"
Sub="{DynamicResource defaultFileManagerToolTip}">
<Button
@ -205,7 +209,7 @@
Content="{Binding Settings.CustomBrowser.Name}" />
</cc:Card>
<cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 30 0 0">
<cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 14 0 0">
<StackPanel Orientation="Horizontal">
<TextBox
Width="300"
@ -235,7 +239,7 @@
<cc:Card
Title="{DynamicResource typingStartEn}"
Margin="0 30 0 0"
Margin="0 14 0 0"
Icon="&#xe8d3;"
Sub="{DynamicResource typingStartEnTooltip}">
<ui:ToggleSwitch
@ -257,7 +261,7 @@
<cc:Card
Title="{DynamicResource language}"
Margin="0 30 0 0"
Margin="0 14 0 0"
Icon="&#xf2b7;">
<ComboBox
MaxWidth="200"

17
Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file

@ -368,7 +368,7 @@
<!-- Drop shadow effect -->
<cc:Card
Title="{DynamicResource queryWindowShadowEffect}"
Margin="0 4 0 0"
Margin="0 8 0 0"
Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectCPUUsage}">
<ui:ToggleSwitch
@ -515,7 +515,7 @@
<!-- Fonts and icons -->
<cc:Card
Title="{DynamicResource useGlyphUI}"
Margin="0 6 0 0"
Margin="0 14 0 0"
Icon="&#xf6b8;"
Sub="{DynamicResource useGlyphUIEffect}">
<ui:ToggleSwitch
@ -525,7 +525,7 @@
</cc:Card>
<!-- Time and date -->
<cc:CardGroup Margin="0 11 0 0">
<cc:CardGroup Margin="0 14 0 0">
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
<StackPanel Orientation="Horizontal">
<TextBlock
@ -570,7 +570,7 @@
</cc:CardGroup>
<!-- Animation -->
<cc:CardGroup Margin="0 11 0 0">
<cc:CardGroup Margin="0 14 0 0">
<cc:Card
Title="{DynamicResource Animation}"
Icon="&#xedb5;"
@ -607,7 +607,7 @@
</cc:CardGroup>
<!-- SFX -->
<cc:CardGroup Margin="0 11 0 0">
<cc:CardGroup Margin="0 14 0 0">
<cc:Card
Title="{DynamicResource SoundEffect}"
Icon="&#xe7f5;"
@ -678,7 +678,7 @@
<!-- Settings color scheme -->
<cc:Card
Title="{DynamicResource ColorScheme}"
Margin="0 11 0 0"
Margin="0 14 0 0"
Icon="&#xe793;">
<ComboBox
MinWidth="180"
@ -691,7 +691,10 @@
</cc:Card>
<!-- Theme folder -->
<cc:Card Title="{DynamicResource ThemeFolder}" Icon="&#xe838;">
<cc:Card
Title="{DynamicResource ThemeFolder}"
Margin="0 14 0 0"
Icon="&#xe838;">
<Button
MinWidth="180"
Command="{Binding OpenThemesFolderCommand}"

19
Flow.Launcher/SettingWindow.xaml
View file

@ -53,12 +53,12 @@
Grid.Column="0"
Width="16"
Height="16"
Margin="10,4,4,4"
Margin="10 4 4 4"
Source="/Images/app.png" />
<TextBlock
Grid.Row="0"
Grid.Column="1"
Margin="4,0,0,0"
Margin="4 0 0 0"
VerticalAlignment="Center"
FontSize="12"
Foreground="{DynamicResource Color05B}"
@ -111,8 +111,8 @@
</Path>
</Button>
<Button
Grid.Row="0"
Name="RestoreButton"
Grid.Row="0"
Grid.Column="3"
Click="OnMaximizeRestoreButtonClick"
Style="{StaticResource TitleBarButtonStyle}">
@ -161,24 +161,23 @@
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="5"
Margin="0,0,0,0"
Margin="0 0 0 0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
AlwaysShowHeader="False"
Background="{DynamicResource Color01B}"
ExpandedModeThresholdWidth="300"
IsBackButtonVisible="Collapsed"
IsBackEnabled="False"
IsPaneToggleButtonVisible="False"
IsSettingsVisible="False"
IsTabStop="False"
OpenPaneLength="230"
OpenPaneLength="240"
PaneDisplayMode="Left"
IsBackEnabled="False"
SelectionChanged="NavigationView_SelectionChanged">
<ui:NavigationView.HeaderTemplate>
<DataTemplate>
<TextBlock
Margin="-8,18,0,5"
Margin="-8 18 0 5"
VerticalAlignment="Center"
FontSize="30"
FontWeight="Medium"
@ -187,7 +186,7 @@
</DataTemplate>
</ui:NavigationView.HeaderTemplate>
<ui:NavigationView.PaneCustomContent>
<Grid Margin="0,35,0,0" HorizontalAlignment="Center">
<Grid Margin="0 35 0 0" HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="50" />
<RowDefinition Height="27" />
@ -201,7 +200,7 @@
Source="images/app.png" />
<TextBlock
Grid.Row="1"
Margin="0,12,0,0"
Margin="0 12 0 0"
Style="{StaticResource TabMenu}"
Text="Flow Launcher"
TextAlignment="Center" />

17
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -670,12 +670,27 @@ namespace Flow.Launcher.ViewModel
get { return _selectedResults; }
set
{
var isReturningFromContextMenu = ContextMenuSelected();
_selectedResults = value;
if (SelectedIsFromQueryResults())
{
ContextMenu.Visibility = Visibility.Collapsed;
History.Visibility = Visibility.Collapsed;
ChangeQueryText(_queryTextBeforeLeaveResults);
// QueryText setter (used in ChangeQueryText) runs the query again, resetting the selected
// result from the one that was selected before going into the context menu to the first result.
// The code below correctly restores QueryText and puts the text caret at the end without
// running the query again when returning from the context menu.
if (isReturningFromContextMenu)
{
_queryText = _queryTextBeforeLeaveResults;
OnPropertyChanged(nameof(QueryText));
QueryTextCursorMovedToEnd = true;
}
else
{
ChangeQueryText(_queryTextBeforeLeaveResults);
}
}
else
{

3
Flow.Launcher/app.manifest
View file

@ -49,13 +49,12 @@
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
</windowsSettings>
</application>
-->
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<dependency>

9
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
View file

@ -276,7 +276,8 @@ namespace Flow.Launcher.Plugin.Explorer
return true;
},
IcoPath = Constants.DifferentUserIconImagePath
IcoPath = Constants.DifferentUserIconImagePath,
Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue748"),
});
}
@ -403,7 +404,8 @@ namespace Flow.Launcher.Plugin.Explorer
return false;
},
IcoPath = Constants.ExcludeFromIndexImagePath
IcoPath = Constants.ExcludeFromIndexImagePath,
Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\uf140"),
};
}
@ -435,7 +437,8 @@ namespace Flow.Launcher.Plugin.Explorer
return false;
}
},
IcoPath = Constants.IndexingOptionsIconImagePath
IcoPath = Constants.IndexingOptionsIconImagePath,
Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue773"),
};
}

BIN
Plugins/Flow.Launcher.Plugin.Explorer/Images/explorer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/gist.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/github.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/gmail.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/google.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/google_drive.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/google_maps.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Plugins/Flow.Launcher.Plugin.WebSearch/Images/google_translate.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB