Skip to content

Commit a82607e

Browse files
author
Lukas Kirschner
committed
Added paulushub's fixes for TestBox, implemented Stroke and Fill TestBox
1 parent ae0dc6b commit a82607e

File tree

7 files changed

+1222
-12
lines changed

7 files changed

+1222
-12
lines changed

‎Tests/SvgTestBox/App.xaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,5 +336,66 @@
336336
</Setter.Value>
337337
</Setter>
338338
</Style>
339+
340+
341+
<Style x:Key="ColorButton.FocusVisual">
342+
<Setter Property="Control.Template">
343+
<Setter.Value>
344+
<ControlTemplate>
345+
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
346+
</ControlTemplate>
347+
</Setter.Value>
348+
</Setter>
349+
</Style>
350+
<SolidColorBrush x:Key="ColorButton.Static.Background" Color="#FFDDDDDD"/>
351+
<SolidColorBrush x:Key="ColorButton.Static.Border" Color="#FF707070"/>
352+
<SolidColorBrush x:Key="ColorButton.MouseOver.Background" Color="#FFBEE6FD"/>
353+
<SolidColorBrush x:Key="ColorButton.MouseOver.Border" Color="#FF3C7FB1"/>
354+
<SolidColorBrush x:Key="ColorButton.Pressed.Background" Color="#FFC4E5F6"/>
355+
<SolidColorBrush x:Key="ColorButton.Pressed.Border" Color="#FF2C628B"/>
356+
<SolidColorBrush x:Key="ColorButton.Disabled.Background" Color="#FFF4F4F4"/>
357+
<SolidColorBrush x:Key="ColorButton.Disabled.Border" Color="#FFADB2B5"/>
358+
<SolidColorBrush x:Key="ColorButton.Disabled.Foreground" Color="#FF838383"/>
359+
360+
<Style x:Key="btnBorderOnly" TargetType="{x:Type Button}">
361+
<Setter Property="FocusVisualStyle" Value="{StaticResource ColorButton.FocusVisual}"/>
362+
<Setter Property="Background" Value="#00000000"/>
363+
<!--<Setter Property="BorderBrush" Value="{StaticResource ColorButton.Static.Border}"/>-->
364+
<Setter Property="BorderBrush" Value="LightGray"/>
365+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
366+
<Setter Property="BorderThickness" Value="1"/>
367+
<Setter Property="HorizontalContentAlignment" Value="Center"/>
368+
<Setter Property="VerticalContentAlignment" Value="Center"/>
369+
<Setter Property="Padding" Value="1"/>
370+
<Setter Property="Template">
371+
<Setter.Value>
372+
<ControlTemplate TargetType="{x:Type Button}">
373+
<Border x:Name="border" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
374+
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}"
375+
RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
376+
</Border>
377+
<ControlTemplate.Triggers>
378+
<Trigger Property="IsDefaulted" Value="true">
379+
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
380+
</Trigger>
381+
<Trigger Property="IsMouseOver" Value="true">
382+
<!--<Setter Property="Background" TargetName="border" Value="{StaticResource ColorButton.MouseOver.Background}"/>-->
383+
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ColorButton.MouseOver.Border}"/>
384+
</Trigger>
385+
<Trigger Property="IsPressed" Value="true">
386+
<!--<Setter Property="Background" TargetName="border" Value="{StaticResource ColorButton.Pressed.Background}"/>-->
387+
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ColorButton.Pressed.Border}"/>
388+
</Trigger>
389+
<Trigger Property="IsEnabled" Value="false">
390+
<!--<Setter Property="Background" TargetName="border" Value="{StaticResource ColorButton.Disabled.Background}"/>-->
391+
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ColorButton.Disabled.Border}"/>
392+
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource ColorButton.Disabled.Foreground}"/>
393+
</Trigger>
394+
</ControlTemplate.Triggers>
395+
</ControlTemplate>
396+
</Setter.Value>
397+
</Setter>
398+
</Style>
399+
339400
</Application.Resources>
340401
</Application>

‎Tests/SvgTestBox/NumericSpinner.xaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<UserControl x:Class="SvgTestBox.NumericSpinner"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:SvgTestBox"
7+
x:Name="ctrlNumericSpinner"
8+
mc:Ignorable="d"
9+
d:DesignHeight="32" d:DesignWidth="100" Padding="0">
10+
<UserControl.Resources>
11+
<ControlTemplate x:Key="updown_button_style" TargetType="Button">
12+
<Border x:Name="br" BorderThickness="1" BorderBrush="Black" Background="Transparent" CornerRadius="0">
13+
<ContentPresenter x:Name="cp" TextElement.Foreground="{TemplateBinding Foreground}"
14+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
15+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
16+
</Border>
17+
<ControlTemplate.Triggers>
18+
<Trigger Property="IsMouseOver" Value="true">
19+
<Setter TargetName="br" Property="Background" Value="#FF3C7FB1" />
20+
</Trigger>
21+
<Trigger Property="IsEnabled" Value="false">
22+
<Setter TargetName="br" Property="Background" Value="Silver" />
23+
</Trigger>
24+
</ControlTemplate.Triggers>
25+
</ControlTemplate>
26+
27+
<Style TargetType="Button">
28+
<Setter Property="Template" Value="{StaticResource updown_button_style}" />
29+
</Style>
30+
</UserControl.Resources>
31+
<Border>
32+
<Border.OpacityMask>
33+
<VisualBrush>
34+
<VisualBrush.Visual>
35+
<Border Background="Black" SnapsToDevicePixels="True"
36+
CornerRadius="1"
37+
Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType=Border}}"
38+
Height="{Binding ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType=Border}}" />
39+
</VisualBrush.Visual>
40+
</VisualBrush>
41+
</Border.OpacityMask>
42+
<Grid>
43+
<Grid.RowDefinitions>
44+
<RowDefinition />
45+
<RowDefinition />
46+
</Grid.RowDefinitions>
47+
<Grid.ColumnDefinitions>
48+
<ColumnDefinition />
49+
<ColumnDefinition Width="18" />
50+
</Grid.ColumnDefinitions>
51+
<TextBox x:Name="spinnerText" x:FieldModifier="private" HorizontalAlignment="Stretch" TextAlignment="Right" VerticalContentAlignment="Center"
52+
Grid.Column="0" Grid.RowSpan="2" Text="0" TextChanged="OnSpinnerTextChanged" GotFocus="OnSpinnerGotFocus" />
53+
<RepeatButton x:Name="spinnerUp" x:FieldModifier="private" Grid.Column="1" Grid.Row="0" Width="auto" Height="auto" Click="OnSpinnerUp">
54+
<Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="Black" Data="M4,0 L0,4 L8,4 z" Stretch="UniformToFill" Margin="1"/>
55+
</RepeatButton>
56+
<RepeatButton x:Name="spinnerDown" x:FieldModifier="private" Grid.Column="1" Grid.Row="1" Width="auto" Height="auto" Click="OnSpinnerDown">
57+
<Path HorizontalAlignment="Center" VerticalAlignment="Center" Fill="Black" Data="M0,0 L8,0 L4,4 z" Stretch="UniformToFill" Margin="1"/>
58+
</RepeatButton>
59+
</Grid>
60+
</Border>
61+
</UserControl>

0 commit comments

Comments
 (0)