Skip to content

Dev #32

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
Apr 5, 2023
+25 −15
Merged

Dev #32

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
486bddd
Update Styles.ListBox.xaml
yanjinhuagood Apr 5, 2023
37da2a2
Update Styles.CheckBox.xaml
yanjinhuagood Apr 5, 2023
5f21902
Update Styles.RadioButton.xaml
yanjinhuagood Apr 5, 2023
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
10 changes: 7 additions & 3 deletions src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
<Style x:Key="DefaultCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource ControlBasicStyle}">
<!--<Setter Property="FocusVisualStyle" Value="{x:Null}" />-->
<Setter Property="Padding" Value="4,0"/>

<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type CheckBox}">
<BulletDecorator Background="Transparent">
<BulletDecorator Background="Transparent"
Margin="{TemplateBinding Margin}">
<BulletDecorator.Bullet>
<Border CornerRadius="{Binding ElementName=PART_Border,Path=CornerRadius}">
<Border CornerRadius="{Binding ElementName=PART_Border,Path=CornerRadius}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
<Border x:Name="PART_Border"
Width="16" Height="16"
CornerRadius="3"
Expand Down
3 changes: 2 additions & 1 deletion src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
<Setter Property="MinWidth" Value="120" />
<Setter Property="MinHeight" Value="95" />
<Setter Property="BorderThickness" Value="0,1,0,0"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBox}">
<Border Name="Border" BorderThickness="0,1,0,0"
<Border Name="Border" BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{DynamicResource BaseSolidColorBrush}">
<ScrollViewer Focusable="False">
<VirtualizingStackPanel IsItemsHost="True" />
Expand Down
27 changes: 16 additions & 11 deletions src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,31 @@
<Setter Property="Background" Value="{DynamicResource WindowForegroundColorBrush}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Padding" Value="4,0"/>

<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type RadioButton}">
<BulletDecorator Background="Transparent">
<BulletDecorator Background="Transparent"
Margin="{TemplateBinding Margin}">
<BulletDecorator.Bullet>
<controls:SmallPanel MinWidth="16" MinHeight="16" >
<Ellipse x:Name="PART_Border"
<Border VerticalAlignment="{TemplateBinding VerticalAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
<controls:SmallPanel MinWidth="16" MinHeight="16" >
<Ellipse x:Name="PART_Border"
StrokeThickness="{TemplateBinding BorderThickness}"
Fill="{TemplateBinding Background}"
Stroke="{DynamicResource BaseSolidColorBrush}">
</Ellipse>
<Ellipse x:Name="PART_Ellipse" Fill="{DynamicResource WindowForegroundColorBrush}"
</Ellipse>
<Ellipse x:Name="PART_Ellipse" Fill="{DynamicResource WindowForegroundColorBrush}"
MinWidth="6" MinHeight="6"
RenderTransformOrigin=".5,.5">
<Ellipse.RenderTransform>
<ScaleTransform ScaleX="0" ScaleY="0"/>
</Ellipse.RenderTransform>
</Ellipse>
</controls:SmallPanel>
<Ellipse.RenderTransform>
<ScaleTransform ScaleX="0" ScaleY="0"/>
</Ellipse.RenderTransform>
</Ellipse>
</controls:SmallPanel>
</Border>
</BulletDecorator.Bullet>
<ContentPresenter x:Name="PART_ContentPresenter"
ContentTemplate="{TemplateBinding ContentTemplate}"
Expand Down