Skip to content
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

Jump to bottom

Use CornerRadius for some controls #3627

Merged
merged 6 commits into from
Oct 4, 2019
Merged

Use CornerRadius for some controls #3627

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
9307151
(GH-3582) Use attached property CornerRadius for TextBox and RichTextBox
punker76 Oct 4, 2019
0c03939
(GH-3582) Use attached property CornerRadius for PasswordBox
punker76 Oct 4, 2019
67e0bad
(GH-3582) Use attached property CornerRadius for DatePicker
punker76 Oct 4, 2019
6a16e56
(GH-3582) Use attached property CornerRadius for DateTimePicker
punker76 Oct 4, 2019
c0d4ad0
(GH-3582) Use attached property CornerRadius for CheckBox
punker76 Oct 4, 2019
b00c16d
(GH-3582) Use attached property CornerRadius for ComboBox (changed on…
punker76 Oct 4, 2019
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
2 changes: 2 additions & 0 deletions src/MahApps.Metro/Styles/Controls.CheckBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Path x:Name="checkBox"
Width="12"
Expand All @@ -51,6 +52,7 @@
Height="18"
Background="{DynamicResource MahApps.Brushes.SemiTransparentWhite}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Grid>
Expand Down
6 changes: 3 additions & 3 deletions src/MahApps.Metro/Styles/Controls.ComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

<Grid Margin="{TemplateBinding BorderThickness}">
Expand All @@ -338,7 +338,7 @@
Margin="0"
Padding="{TemplateBinding Padding}"
VerticalAlignment="Stretch"
Controls:ControlsHelper.CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
Controls:ControlsHelper.CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
Expand Down Expand Up @@ -458,7 +458,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0.6"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down
2 changes: 2 additions & 0 deletions src/MahApps.Metro/Styles/Controls.DatePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding Padding}">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -130,6 +131,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
Expand Down
9 changes: 9 additions & 0 deletions src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,15 @@
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</AdornerDecorator>
<Border x:Name="Base"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid Margin="2">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -241,6 +243,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -378,13 +381,15 @@
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</AdornerDecorator>
<Border x:Name="Base"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="2">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -488,6 +493,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -639,13 +645,15 @@
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</AdornerDecorator>
<Border x:Name="Base"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="2">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -781,6 +789,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down
19 changes: 15 additions & 4 deletions src/MahApps.Metro/Styles/Controls.TextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</AdornerDecorator>
<Border x:Name="Base"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="2">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -164,6 +166,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -311,13 +314,15 @@
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</AdornerDecorator>
<Border x:Name="Base"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="2">
<Grid.ColumnDefinitions>
Expand Down Expand Up @@ -410,6 +415,7 @@
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -593,6 +599,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

<Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
Expand Down Expand Up @@ -690,6 +697,9 @@

<Border x:Name="DisabledVisualElement"
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -795,6 +805,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

<Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
Expand Down Expand Up @@ -895,6 +906,9 @@

<Border x:Name="DisabledVisualElement"
Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
IsHitTestVisible="False"
Opacity="0"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -959,7 +973,4 @@
</Setter>
</Style>

</ResourceDictionary>



</ResourceDictionary>
1 change: 1 addition & 0 deletions src/MahApps.Metro/Themes/DateTimePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding Padding}">
<Grid.ColumnDefinitions>
Expand Down