Skip to content

Commit 8712dbc

Browse files
committed
Fix issue (#150
1 parent 4bf26d3 commit 8712dbc

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
wd:Loading.LoadingType="Normal"
3434
Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg" />
3535
<Button
36-
Height="28"
36+
Width="50"
3737
HorizontalAlignment="Center"
3838
VerticalAlignment="Top"
39+
wd:ElementHelper.IsRound="True"
3940
wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
4041
Content="Mask 1" />
4142
<Button

src/WPFDevelopers.Shared/Controls/Loading/Loading.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Windows.Documents;
33
using System.Windows.Media;
44
using WPFDevelopers.Core;
5+
using WPFDevelopers.Helpers;
56
using WPFDevelopers.Utilities;
67

78
namespace WPFDevelopers.Controls
@@ -125,10 +126,11 @@ private static void CreateLoading(UIElement uIElement, bool isRemove = false)
125126

126127
if (value != null)
127128
{
129+
var cornerRadius = ElementHelper.GetCornerRadius(uIElement);
128130
adornerContainer.Child = new MaskControl(uIElement)
129131
{
132+
CornerRadius = cornerRadius,
130133
Content = value,
131-
//Background = ThemeManager.Instance.BackgroundBrush
132134
};
133135
}
134136

src/WPFDevelopers.Shared/Core/Converts/WidthHeightEqualValueConverter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
1212
var height = (double) values[1];
1313
if (width == 0 && height == 0)
1414
return 0;
15-
var min = Math.Min(width, height);
16-
return min;
15+
var max = Math.Max(width, height);
16+
return max;
1717
}
1818

1919
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

src/WPFDevelopers.Shared/Styles/Styles.Buttons.xaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Setter Property="Background" Value="{DynamicResource WD.ButtonFocusVisualColor}" />
5757
</Trigger>
5858
<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
59-
<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
59+
<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
6060
<Setter TargetName="PART_Border" Property="Width">
6161
<Setter.Value>
6262
<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
@@ -106,7 +106,7 @@
106106
</Trigger>
107107
<Trigger Property="IsMouseOver" Value="True" />
108108
<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
109-
<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
109+
<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
110110
<Setter TargetName="PART_Border" Property="Width">
111111
<Setter.Value>
112112
<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
@@ -167,7 +167,7 @@
167167
</Trigger>
168168
<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
169169
<Setter Property="Padding" Value="0" />
170-
<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
170+
<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
171171
<Setter TargetName="PART_Border" Property="Width">
172172
<Setter.Value>
173173
<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">

0 commit comments

Comments
 (0)