File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed
MahApps.Metro/Controls/Icons
Mahapps.Metro.Tests/Tests Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change 2
2
// The .NET Foundation licenses this file to you under the MIT license.
3
3
// See the LICENSE file in the project root for more information.
4
4
5
+ using System . ComponentModel ;
5
6
using System . Windows ;
6
7
using System . Windows . Media ;
7
8
using System . Windows . Shapes ;
@@ -23,6 +24,7 @@ public static readonly DependencyProperty DataProperty
23
24
/// <summary>
24
25
/// Gets or sets a Geometry that specifies the shape to be drawn. In XAML this can also be set using the Path Markup Syntax.
25
26
/// </summary>
27
+ [ TypeConverter ( typeof ( GeometryConverter ) ) ]
26
28
public Geometry ? Data
27
29
{
28
30
get => ( Geometry ? ) this . GetValue ( DataProperty ) ;
Original file line number Diff line number Diff line change @@ -64,13 +64,16 @@ public async Task TestAttachedPropertyButtonContent()
64
64
await this . fixture . PrepareForTestAsync ( new [ ] { TextBoxHelper . ButtonContentProperty . Name } ) ;
65
65
await TestHost . SwitchToAppThread ( ) ;
66
66
67
- var content = "42 " ;
67
+ var content = "M237.5 75A12.5 12.5 0 0 0 237.5 100A12.5 12.5 0 0 1 250 112.5V212.5A12.5 12.5 0 0 1 237.5 225H142.6875L136.8 241.675A12.5125 12.5125 0 0 1 125 250H62.5A12.5 12.5 0 0 1 50 237.5V112.5A12.5 12.5 0 0 1 62.5 100A12.5 12.5 0 0 0 62.5 75A37.5 37.5 0 0 0 25 112.5V237.5A37.5 37.5 0 0 0 62.5 275H125C141.325 275 155.2125 264.5625 160.375 250H237.5A37.5 37.5 0 0 0 275 212.5V112.5A37.5 37.5 0 0 0 237.5 75zM174.875 76.2A62.525 62.525 0 0 0 96.2125 172.5375A62.5 62.5 0 0 0 192.55 93.875L228.8 57.625A12.5 12.5 0 0 0 211.1125 39.9625L174.8625 76.2000000000001zM166.925 101.825A37.5 37.5 0 1 1 113.875 154.875A37.5 37.5 0 0 1 166.9125 101.8375z " ;
68
68
69
- this . fixture . Window ? . TestTextBox . SetValue ( TextBoxHelper . ButtonContentProperty , content ) ;
70
- Assert . Equal ( content , this . fixture . Window ? . TestTextBox . FindChild < Button > ( "PART_ClearText" ) ? . Content ) ;
71
69
this . fixture . Window ? . TestButtonTextBox . SetValue ( TextBoxHelper . ButtonContentProperty , content ) ;
72
70
Assert . Equal ( content , this . fixture . Window ? . TestButtonTextBox . FindChild < Button > ( "PART_ClearText" ) ? . Content ) ;
73
71
72
+ content = "42" ;
73
+
74
+ this . fixture . Window ? . TestTextBox . SetValue ( TextBoxHelper . ButtonContentProperty , content ) ;
75
+ Assert . Equal ( content , this . fixture . Window ? . TestTextBox . FindChild < Button > ( "PART_ClearText" ) ? . Content ) ;
76
+
74
77
this . fixture . Window ? . TestPasswordBox . SetValue ( TextBoxHelper . ButtonContentProperty , content ) ;
75
78
Assert . Equal ( content , this . fixture . Window ? . TestPasswordBox . FindChild < Button > ( "PART_ClearText" ) ? . Content ) ;
76
79
this . fixture . Window ? . TestButtonRevealedPasswordBox . SetValue ( TextBoxHelper . ButtonContentProperty , content ) ;
You can’t perform that action at this time.
0 commit comments