Skip to content

Plugin activation icon #911

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 6 commits into from
Jan 5, 2022
Merged

Plugin activation icon #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
007a3ea
Trigger on plugin
Garulf Dec 17, 2021
2c73a5b
return null if not a plugin activated
Garulf Dec 17, 2021
8241950
Clear icon on empty query
Garulf Dec 17, 2021
861e5cb
Hide SearchIcon if plugin activated
Garulf Dec 17, 2021
4427260
Add PluginActivationIcon
onesounds Dec 17, 2021
4baf205
Fix Image Render
onesounds Dec 17, 2021
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
19 changes: 15 additions & 4 deletions Flow.Launcher/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@
<KeyBinding Key="Escape" Command="{Binding EscCommand}" />
<KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
<KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
<KeyBinding
Key="Tab"
Command="{Binding AutocompleteQueryCommand}"/>
<KeyBinding Key="Tab" Command="{Binding AutocompleteQueryCommand}" />
<KeyBinding
Key="Tab"
Command="{Binding AutocompleteQueryCommand}"
Expand Down Expand Up @@ -192,12 +190,25 @@
</TextBox.ContextMenu>
</TextBox>
<Canvas Style="{DynamicResource SearchIconPosition}">
<Image
x:Name="PluginActivationIcon"
Width="32"
Height="32"
Margin="0,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Panel.ZIndex="2"
RenderOptions.BitmapScalingMode="HighQuality"
Source="{Binding PluginIconPath}"
Stretch="Uniform"
Style="{DynamicResource PluginActivationIcon}" />
<Path
Name="SearchIcon"
Margin="0"
Data="{DynamicResource SearchIconImg}"
Stretch="Fill"
Style="{DynamicResource SearchIconStyle}" />
Style="{DynamicResource SearchIconStyle}"
Visibility="{Binding SearchIconVisibility}" />
</Canvas>
</Grid>

Expand Down
18 changes: 18 additions & 0 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,12 @@ private ResultsViewModel SelectedResults
// because it is more accurate and reliable representation than using Visibility as a condition check
public bool MainWindowVisibilityStatus { get; set; } = true;

public Visibility SearchIconVisibility { get; set; }

public double MainWindowWidth => _settings.WindowSize;

public string PluginIconPath { get; set; } = null;

public ICommand EscCommand { get; set; }
public ICommand SelectNextItemCommand { get; set; }
public ICommand SelectPrevItemCommand { get; set; }
Expand Down Expand Up @@ -528,6 +532,8 @@ private async void QueryResults()
{
Results.Clear();
Results.Visbility = Visibility.Collapsed;
PluginIconPath = null;
SearchIconVisibility = Visibility.Visible;
return;
}

Expand Down Expand Up @@ -556,6 +562,18 @@ private async void QueryResults()

var plugins = PluginManager.ValidPluginsForQuery(query);

if (plugins.Count == 1)
{
PluginIconPath = plugins.Single().Metadata.IcoPath;
SearchIconVisibility = Visibility.Hidden;
}
else
{
PluginIconPath = null;
SearchIconVisibility = Visibility.Visible;
}


if (query.ActionKeyword == Plugin.Query.GlobalPluginWildcardSign)
{
// Wait 45 millisecond for query change in global query
Expand Down