Skip to content

Commit c7dc517

Browse files
cshtml5cshtml5
committed
Move the "FlatButtonStyle" to Styles.xaml
1 parent 69eca6b commit c7dc517

File tree

2 files changed

+55
-60
lines changed

2 files changed

+55
-60
lines changed

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/App.xaml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,6 @@
77
<ResourceDictionary.MergedDictionaries>
88
<ResourceDictionary Source="Other/Styles.xaml"/>
99
</ResourceDictionary.MergedDictionaries>
10-
11-
<Style x:Key="FlatButtonStyle" TargetType="Button">
12-
<Setter Property="Background" Value="#FFE2E2E2"/>
13-
<Setter Property="Foreground" Value="Black"/>
14-
<Setter Property="BorderThickness" Value="0"/>
15-
<Setter Property="Padding" Value="12,4,12,4"/>
16-
<Setter Property="Cursor" Value="Hand"/>
17-
<Setter Property="HorizontalContentAlignment" Value="Center"/>
18-
<Setter Property="VerticalContentAlignment" Value="Center"/>
19-
<Setter Property="Template">
20-
<Setter.Value>
21-
<ControlTemplate TargetType="Button">
22-
<Border x:Name="OuterBorder"
23-
Background="{TemplateBinding Background}"
24-
BorderBrush="{TemplateBinding BorderBrush}"
25-
BorderThickness="{TemplateBinding BorderThickness}">
26-
<VisualStateManager.VisualStateGroups>
27-
<VisualStateGroup Name="CommonStates">
28-
<VisualState Name="Normal">
29-
</VisualState>
30-
<VisualState Name="PointerOver">
31-
<Storyboard>
32-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
33-
<DiscreteObjectKeyFrame KeyTime="0" Value="#11000000"/>
34-
</ObjectAnimationUsingKeyFrames>
35-
</Storyboard>
36-
</VisualState>
37-
<VisualState Name="Pressed">
38-
<Storyboard>
39-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
40-
<DiscreteObjectKeyFrame KeyTime="0" Value="#22000000"/>
41-
</ObjectAnimationUsingKeyFrames>
42-
</Storyboard>
43-
</VisualState>
44-
<VisualState Name="Disabled">
45-
<Storyboard>
46-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
47-
<DiscreteObjectKeyFrame KeyTime="0" Value="#33FFFFFF"/>
48-
</ObjectAnimationUsingKeyFrames>
49-
</Storyboard>
50-
</VisualState>
51-
</VisualStateGroup>
52-
</VisualStateManager.VisualStateGroups>
53-
<Border x:Name="InnerBorder"
54-
Background="{TemplateBinding Background}">
55-
<ContentPresenter x:Name="ContentPresenter"
56-
ContentTemplate="{TemplateBinding ContentTemplate}"
57-
Content="{TemplateBinding Content}"
58-
Margin="{TemplateBinding Padding}"
59-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
60-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
61-
</Border>
62-
</Border>
63-
</ControlTemplate>
64-
</Setter.Value>
65-
</Setter>
66-
</Style>
6710
</ResourceDictionary>
6811
</Application.Resources>
6912
</Application>

‎OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/Other/Styles.xaml

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,60 @@
337337
</Setter>
338338
</Style>
339339

340-
<Style TargetType="StackPanel" x:Key="TestPanel">
341-
<Setter Property="Background" Value="#ff0000"/>
340+
<Style x:Key="FlatButtonStyle" TargetType="Button">
341+
<Setter Property="Background" Value="#FFE2E2E2"/>
342+
<Setter Property="Foreground" Value="Black"/>
343+
<Setter Property="BorderThickness" Value="0"/>
344+
<Setter Property="Padding" Value="12,4,12,4"/>
345+
<Setter Property="Cursor" Value="Hand"/>
346+
<Setter Property="HorizontalContentAlignment" Value="Center"/>
347+
<Setter Property="VerticalContentAlignment" Value="Center"/>
348+
<Setter Property="Template">
349+
<Setter.Value>
350+
<ControlTemplate TargetType="Button">
351+
<Border x:Name="OuterBorder"
352+
Background="{TemplateBinding Background}"
353+
BorderBrush="{TemplateBinding BorderBrush}"
354+
BorderThickness="{TemplateBinding BorderThickness}">
355+
<VisualStateManager.VisualStateGroups>
356+
<VisualStateGroup Name="CommonStates">
357+
<VisualState Name="Normal">
358+
</VisualState>
359+
<VisualState Name="PointerOver">
360+
<Storyboard>
361+
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
362+
<DiscreteObjectKeyFrame KeyTime="0" Value="#11000000"/>
363+
</ObjectAnimationUsingKeyFrames>
364+
</Storyboard>
365+
</VisualState>
366+
<VisualState Name="Pressed">
367+
<Storyboard>
368+
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
369+
<DiscreteObjectKeyFrame KeyTime="0" Value="#22000000"/>
370+
</ObjectAnimationUsingKeyFrames>
371+
</Storyboard>
372+
</VisualState>
373+
<VisualState Name="Disabled">
374+
<Storyboard>
375+
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="InnerBorder">
376+
<DiscreteObjectKeyFrame KeyTime="0" Value="#33FFFFFF"/>
377+
</ObjectAnimationUsingKeyFrames>
378+
</Storyboard>
379+
</VisualState>
380+
</VisualStateGroup>
381+
</VisualStateManager.VisualStateGroups>
382+
<Border x:Name="InnerBorder"
383+
Background="{TemplateBinding Background}">
384+
<ContentPresenter x:Name="ContentPresenter"
385+
ContentTemplate="{TemplateBinding ContentTemplate}"
386+
Content="{TemplateBinding Content}"
387+
Margin="{TemplateBinding Padding}"
388+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
389+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
390+
</Border>
391+
</Border>
392+
</ControlTemplate>
393+
</Setter.Value>
394+
</Setter>
342395
</Style>
343-
<!--<Style TargetType="StackPanel" BasedOn="TestPanel"/>-->
344396
</ResourceDictionary>

0 commit comments

Comments
 (0)