Skip to content

Commit 713cb69

Browse files
punker76punker76
committed
Slider: remove linear gradient brush from horizontal and vertical track value style
RangeSlider: fix margin of the middle thumb
1 parent de6311a commit 713cb69

File tree

3 files changed

+27
-51
lines changed

3 files changed

+27
-51
lines changed

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/HamburgerMenuDefault.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@
232232
<RowDefinition Height="48" />
233233
<RowDefinition />
234234
</Grid.RowDefinitions>
235-
<Border Grid.Row="0" Background="#7A7A7A" Margin="-1 0 -1 0">
235+
<Border Grid.Row="0"
236+
Margin="-1 0 -1 0"
237+
Background="#7A7A7A">
236238
<TextBlock x:Name="Header"
237239
HorizontalAlignment="Center"
238240
VerticalAlignment="Center"

‎src/MahApps.Metro/MahApps.Metro/Styles/Controls.Slider.xaml‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,10 @@
8989
<Setter Property="Template">
9090
<Setter.Value>
9191
<ControlTemplate TargetType="{x:Type RepeatButton}">
92-
<Grid x:Name="Root" Margin="0 -1 0 0">
93-
<Rectangle Height="5" Margin="0 1 0 0">
94-
<Rectangle.Fill>
95-
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
96-
<GradientStop Offset="0.0" Color="{TemplateBinding Background}" />
97-
<GradientStop Offset="0.25" Color="{DynamicResource AccentColor}" />
98-
<GradientStop Offset="0.75" Color="{DynamicResource AccentColor}" />
99-
<GradientStop Offset="1.0" Color="{TemplateBinding Background}" />
100-
</LinearGradientBrush>
101-
</Rectangle.Fill>
102-
</Rectangle>
103-
<VisualStateManager.VisualStateGroups>
104-
<VisualStateGroup x:Name="CommonStates">
105-
<VisualState x:Name="Normal" />
106-
<VisualState x:Name="MouseOver" />
107-
<VisualState x:Name="Pressed" />
108-
<VisualState x:Name="Disabled" />
109-
</VisualStateGroup>
110-
</VisualStateManager.VisualStateGroups>
92+
<Grid Margin="0 -1 0 0">
93+
<Rectangle Height="5"
94+
Margin="0 1 0 0"
95+
Fill="{DynamicResource AccentColorBrush}" />
11196
</Grid>
11297
</ControlTemplate>
11398
</Setter.Value>
@@ -136,17 +121,17 @@
136121
Visibility="Collapsed" />
137122
<Track x:Name="PART_Track" Grid.Row="1">
138123
<Track.DecreaseRepeatButton>
139-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource HorizontalTrackValue}" />
124+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource HorizontalTrackValue}" />
140125
</Track.DecreaseRepeatButton>
141126
<Track.IncreaseRepeatButton>
142-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource HorizontalTrackLargeDecrease}" />
127+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{DynamicResource HorizontalTrackLargeDecrease}" />
143128
</Track.IncreaseRepeatButton>
144129
<Track.Thumb>
145130
<controls:MetroThumb x:Name="HorizontalThumb"
146131
Width="{DynamicResource HorizontalThumbWidth}"
147132
Height="{DynamicResource HorizontalThumbHeight}"
148133
IsTabStop="True"
149-
Style="{StaticResource HorizontalSliderThumb}" />
134+
Style="{DynamicResource HorizontalSliderThumb}" />
150135
</Track.Thumb>
151136
</Track>
152137
</Grid>
@@ -215,25 +200,10 @@
215200
<Setter Property="Template">
216201
<Setter.Value>
217202
<ControlTemplate TargetType="{x:Type RepeatButton}">
218-
<Grid x:Name="Root" Margin="-1 0 0 0">
219-
<Rectangle Width="5" Margin="1 0 0 0">
220-
<Rectangle.Fill>
221-
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
222-
<GradientStop Offset="0.0" Color="{TemplateBinding Background}" />
223-
<GradientStop Offset="0.25" Color="{DynamicResource AccentColor}" />
224-
<GradientStop Offset="0.75" Color="{DynamicResource AccentColor}" />
225-
<GradientStop Offset="1.0" Color="{TemplateBinding Background}" />
226-
</LinearGradientBrush>
227-
</Rectangle.Fill>
228-
</Rectangle>
229-
<VisualStateManager.VisualStateGroups>
230-
<VisualStateGroup x:Name="CommonStates">
231-
<VisualState x:Name="Normal" />
232-
<VisualState x:Name="MouseOver" />
233-
<VisualState x:Name="Pressed" />
234-
<VisualState x:Name="Disabled" />
235-
</VisualStateGroup>
236-
</VisualStateManager.VisualStateGroups>
203+
<Grid Margin="-1 0 0 0">
204+
<Rectangle Width="5"
205+
Margin="1 0 0 0"
206+
Fill="{DynamicResource AccentColorBrush}" />
237207
</Grid>
238208
</ControlTemplate>
239209
</Setter.Value>
@@ -262,17 +232,17 @@
262232
Visibility="Collapsed" />
263233
<Track x:Name="PART_Track" Grid.Column="1">
264234
<Track.DecreaseRepeatButton>
265-
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource VerticalTrackValue}" />
235+
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource VerticalTrackValue}" />
266236
</Track.DecreaseRepeatButton>
267237
<Track.IncreaseRepeatButton>
268-
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource VerticalTrackLargeDecrease}" />
238+
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{DynamicResource VerticalTrackLargeDecrease}" />
269239
</Track.IncreaseRepeatButton>
270240
<Track.Thumb>
271241
<controls:MetroThumb x:Name="VerticalThumb"
272242
Width="{DynamicResource VerticalThumbWidth}"
273243
Height="{DynamicResource VerticalThumbHeight}"
274244
IsTabStop="True"
275-
Style="{StaticResource VerticalSliderThumb}" />
245+
Style="{DynamicResource VerticalSliderThumb}" />
276246
</Track.Thumb>
277247
</Track>
278248
</Grid>

‎src/MahApps.Metro/MahApps.Metro/Themes/RangeSlider.xaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@
3535
<Setter Property="Template">
3636
<Setter.Value>
3737
<ControlTemplate>
38-
<Rectangle Height="5"
39-
Margin="0 1 0 0"
40-
Fill="{DynamicResource AccentColorBrush}" />
38+
<Grid Margin="0 -1 0 0">
39+
<Rectangle Height="5"
40+
Margin="0 1 0 0"
41+
Fill="{DynamicResource AccentColorBrush}" />
42+
</Grid>
4143
</ControlTemplate>
4244
</Setter.Value>
4345
</Setter>
@@ -111,9 +113,11 @@
111113
<Setter Property="Template">
112114
<Setter.Value>
113115
<ControlTemplate>
114-
<Rectangle Width="5"
115-
Margin="0 0 0 0"
116-
Fill="{DynamicResource AccentColorBrush}" />
116+
<Grid Margin="-1 0 0 0">
117+
<Rectangle Width="5"
118+
Margin="1 0 0 0"
119+
Fill="{DynamicResource AccentColorBrush}" />
120+
</Grid>
117121
</ControlTemplate>
118122
</Setter.Value>
119123
</Setter>

0 commit comments

Comments
 (0)