Skip to content

Rounded icon mask field #1352

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 3 commits into from
Oct 3, 2022
Merged

Rounded icon mask field #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
239c9d7
Add field to control if Icon uses rounded mask
Garulf Aug 30, 2022
70ea6a8
Remove Icon X & Y hard coded dependency
Garulf Aug 30, 2022
bd1499b
Add clip mask
Garulf Aug 30, 2022
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
4 changes: 4 additions & 0 deletions Flow.Launcher.Plugin/Result.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ public string IcoPath
}
}
}
/// <summary>
/// Determines if Icon has a border radius
/// </summary>
public bool RoundedIcon { get; set; } = false;

/// <summary>
/// Delegate function, see <see cref="Icon"/>
Expand Down
10 changes: 7 additions & 3 deletions Flow.Launcher/ResultListBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,17 @@
BorderThickness="0">
<Image
x:Name="ImageIcon"
Width="32"
Height="32"
Width="{Binding IconXY}"
Height="{Binding IconXY}"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Source="{Binding Image, TargetNullValue={x:Null}}"
Stretch="Uniform"
Visibility="{Binding ShowIcon}" />
Visibility="{Binding ShowIcon}">
<Image.Clip>
<EllipseGeometry RadiusX="{Binding IconRadius}" RadiusY="{Binding IconRadius}" Center="16 16"/>
</Image.Clip>
</Image>
</Border>
<Border
Margin="9,0,0,0"
Expand Down
15 changes: 15 additions & 0 deletions Flow.Launcher/ViewModel/ResultViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@ public Visibility ShowIcon
}
}

public double IconRadius
{
get
{
if (Result.RoundedIcon)
Copy link
Member

@taooceros taooceros Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this is a bit hacky🤣
And also you may need a OnPropertyChanged? (maybe not because fody handles that)

{
return IconXY / 2;
}
return IconXY;
}

}

public Visibility ShowGlyph
{
get
Expand Down Expand Up @@ -165,6 +178,8 @@ private async ValueTask LoadImageAsync()

public string QuerySuggestionText { get; set; }

public double IconXY { get; set; } = 32;

public override bool Equals(object obj)
{
return obj is ResultViewModel r && Result.Equals(r.Result);
Expand Down