Added new icon element (and markup) - DrawingBrushIcon. New constants for NavigationLeftCompact #1061
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,70 @@ | ||||||||
| // This Source Code Form is subject to the terms of the MIT License. | ||||||||
| // If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT. | ||||||||
| // Copyright (C) Leszek Pomianowski and WPF UI Contributors. | ||||||||
| // All Rights Reserved. | ||||||||
|
|
||||||||
|
Check warning on line 5 in src/Wpf.Ui/Controls/IconElement/DrawingBrushIcon.cs
|
||||||||
|
|
||||||||
|
|
||||||||
| using System.Windows.Controls; | ||||||||
|
|
||||||||
| namespace Wpf.Ui.Controls; | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| public class DrawingBrushIcon : IconElement | ||||||||
|
Check warning on line 10 in src/Wpf.Ui/Controls/IconElement/DrawingBrushIcon.cs
|
||||||||
|
There was a problem hiding this comment. Missing docs for the public API |
||||||||
| { | ||||||||
| public DrawingBrush Icon | ||||||||
| { | ||||||||
| get { return (DrawingBrush)GetValue(IconProperty); } | ||||||||
| set { SetValue(IconProperty, value); } | ||||||||
| } | ||||||||
|
|
||||||||
| public static readonly DependencyProperty IconProperty = | ||||||||
| DependencyProperty.Register("Icon", typeof(DrawingBrush), typeof(DrawingBrushIcon), new PropertyMetadata(default(DrawingBrush), OnIconChanged)); | ||||||||
|
|
||||||||
| private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) | ||||||||
| { | ||||||||
| var self = (DrawingBrushIcon)d; | ||||||||
| if (self.Border is null) | ||||||||
| return; | ||||||||
|
There was a problem hiding this comment. Missing brackets according to the .editorconfig |
||||||||
|
|
||||||||
| self.Border.Background = e.NewValue as DrawingBrush; | ||||||||
| } | ||||||||
|
|
||||||||
| public double Size | ||||||||
| { | ||||||||
| get { return (double)GetValue(SizeProperty); } | ||||||||
| set { SetValue(SizeProperty, value); } | ||||||||
| } | ||||||||
|
|
||||||||
| // Using a DependencyProperty as the backing store for IconSize. This enables animation, styling, binding, etc... | ||||||||
| public static readonly DependencyProperty SizeProperty = | ||||||||
| DependencyProperty.Register("Size", typeof(double), typeof(DrawingBrushIcon), new PropertyMetadata(16.0, OnIconSizeChanged)); | ||||||||
|
|
||||||||
| private static void OnIconSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) | ||||||||
| { | ||||||||
| var self = (DrawingBrushIcon)d; | ||||||||
| if (self.Border is null) | ||||||||
| return; | ||||||||
|
|
||||||||
| if (double.TryParse(e.NewValue?.ToString(), out double dblValue)) | ||||||||
| { | ||||||||
| self.Border.Width = dblValue; | ||||||||
| self.Border.Height = dblValue; | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| protected Border? Border; | ||||||||
|
|
||||||||
| protected override UIElement InitializeChildren() | ||||||||
| { | ||||||||
| Border = new Border() | ||||||||
| { | ||||||||
| HorizontalAlignment = HorizontalAlignment.Stretch, | ||||||||
| Background = Icon, | ||||||||
| Width = Size, | ||||||||
| Height = Size | ||||||||
| }; | ||||||||
|
|
||||||||
| Viewbox viewbox = new Viewbox(); | ||||||||
| viewbox.Child = Border; | ||||||||
|
|
||||||||
| return viewbox; | ||||||||
| } | ||||||||
| } | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // This Source Code Form is subject to the terms of the MIT License. | ||
| // If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT. | ||
| // Copyright (C) Leszek Pomianowski and WPF UI Contributors. | ||
| // All Rights Reserved. | ||
|
|
||
| using System.Windows.Markup; | ||
| using Wpf.Ui.Controls; | ||
|
|
||
| namespace Wpf.Ui.Markup; | ||
|
|
||
| [ContentProperty(nameof(Icon))] | ||
| [MarkupExtensionReturnType(typeof(DrawingBrushIcon))] | ||
| public class DrawingBrushIconExtension : MarkupExtension | ||
| { | ||
|
|
||
| public DrawingBrushIconExtension(DrawingBrush icon) | ||
| { | ||
| Icon = icon; | ||
| } | ||
| public DrawingBrushIconExtension(DrawingBrush icon, double size) | ||
|
Check warning on line 19 in src/Wpf.Ui/Markup/DrawingBrushIconExtension.cs
|
||
| : this(icon) | ||
| { | ||
| Size = size; | ||
| } | ||
|
|
||
| [ConstructorArgument("icon")] | ||
| public DrawingBrush Icon { get; set; } | ||
|
|
||
| [ConstructorArgument("Size")] | ||
|
Check warning on line 28 in src/Wpf.Ui/Markup/DrawingBrushIconExtension.cs
|
||
| public double Size { get; set; } = 16; | ||
|
|
||
| public override object ProvideValue(IServiceProvider serviceProvider) | ||
| { | ||
| var drawingBrushIcon = new DrawingBrushIcon { Icon = Icon, Size = Size }; | ||
|
|
||
| return drawingBrushIcon; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Formatting