Skip to content

Commit 85ce7dd

Browse files
xaviergonzxaviergonz
committed
second fix to tab formatting
1 parent bd0d33a commit 85ce7dd

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -190,62 +190,62 @@
190190
<Setter.Value>
191191
<ControlTemplate TargetType="{x:Type ToggleButton}">
192192
<Grid ClipToBounds="True" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
193-
<VisualStateManager.VisualStateGroups>
194-
<VisualStateGroup x:Name="CommonStates">
195-
<VisualState x:Name="Normal"/>
196-
<VisualState x:Name="Disabled">
197-
<Storyboard>
198-
<DoubleAnimation Duration="0" To="0.23" Storyboard.TargetProperty="(UIElement.Opacity)" />
199-
</Storyboard>
200-
</VisualState>
201-
</VisualStateGroup>
202-
<VisualStateGroup x:Name="CheckStates">
203-
<VisualStateGroup.Transitions>
204-
<VisualTransition From="*" To="Checked">
193+
<VisualStateManager.VisualStateGroups>
194+
<VisualStateGroup x:Name="CommonStates">
195+
<VisualState x:Name="Normal"/>
196+
<VisualState x:Name="Disabled">
197+
<Storyboard>
198+
<DoubleAnimation Duration="0" To="0.23" Storyboard.TargetProperty="(UIElement.Opacity)" />
199+
</Storyboard>
200+
</VisualState>
201+
</VisualStateGroup>
202+
<VisualStateGroup x:Name="CheckStates">
203+
<VisualStateGroup.Transitions>
204+
<VisualTransition From="*" To="Checked">
205+
<Storyboard>
206+
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale">
207+
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.0" />
208+
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.1" />
209+
</DoubleAnimationUsingKeyFrames>
210+
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale">
211+
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.0" />
212+
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.1" />
213+
</DoubleAnimationUsingKeyFrames>
214+
</Storyboard>
215+
</VisualTransition>
216+
<VisualTransition From="Checked" To="Unchecked">
217+
<Storyboard>
218+
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale">
219+
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.0" />
220+
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.1" />
221+
</DoubleAnimationUsingKeyFrames>
222+
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale">
223+
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.0" />
224+
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.1" />
225+
</DoubleAnimationUsingKeyFrames>
226+
</Storyboard>
227+
</VisualTransition>
228+
</VisualStateGroup.Transitions>
229+
<VisualState x:Name="Checked">
205230
<Storyboard>
206-
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale">
207-
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.0" />
208-
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.1" />
209-
</DoubleAnimationUsingKeyFrames>
210-
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale">
211-
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.0" />
212-
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.1" />
213-
</DoubleAnimationUsingKeyFrames>
231+
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale" To="1.0" />
232+
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale" To="1.0" />
214233
</Storyboard>
215-
</VisualTransition>
216-
<VisualTransition From="Checked" To="Unchecked">
234+
</VisualState>
235+
<VisualState x:Name="Unchecked">
217236
<Storyboard>
218-
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale">
219-
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.0" />
220-
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.1" />
221-
</DoubleAnimationUsingKeyFrames>
222-
<DoubleAnimationUsingKeyFrames Duration="0:0:0.2" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale">
223-
<LinearDoubleKeyFrame Value="1.0" KeyTime="0:0:0.0" />
224-
<LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.1" />
225-
</DoubleAnimationUsingKeyFrames>
237+
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale" To="0" />
238+
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale" To="0" />
226239
</Storyboard>
227-
</VisualTransition>
228-
</VisualStateGroup.Transitions>
229-
<VisualState x:Name="Checked">
230-
<Storyboard>
231-
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale" To="1.0" />
232-
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale" To="1.0" />
233-
</Storyboard>
234-
</VisualState>
235-
<VisualState x:Name="Unchecked">
236-
<Storyboard>
237-
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="CheckedEllipseScale" To="0" />
238-
<DoubleAnimation Duration="0" Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="CheckedEllipseScale" To="0" />
239-
</Storyboard>
240-
</VisualState>
241-
</VisualStateGroup>
242-
</VisualStateManager.VisualStateGroups>
243-
<Ellipse Fill="Transparent" x:Name="HoverEllipse" Stroke="Transparent" StrokeThickness="1" />
244-
<Ellipse Fill="{TemplateBinding Background}" x:Name="CheckedEllipse" RenderTransformOrigin="0.5, 0.5">
245-
<Ellipse.RenderTransform>
246-
<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1.0" ScaleY="1.0" x:Name="CheckedEllipseScale"/>
247-
</Ellipse.RenderTransform>
248-
</Ellipse>
240+
</VisualState>
241+
</VisualStateGroup>
242+
</VisualStateManager.VisualStateGroups>
243+
<Ellipse Fill="Transparent" x:Name="HoverEllipse" Stroke="Transparent" StrokeThickness="1" />
244+
<Ellipse Fill="{TemplateBinding Background}" x:Name="CheckedEllipse" RenderTransformOrigin="0.5, 0.5">
245+
<Ellipse.RenderTransform>
246+
<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1.0" ScaleY="1.0" x:Name="CheckedEllipseScale"/>
247+
</Ellipse.RenderTransform>
248+
</Ellipse>
249249
<ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
250250
</Grid>
251251
<ControlTemplate.Triggers>

0 commit comments

Comments
 (0)