Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatSlider.xaml" />
</ResourceDictionary.MergedDictionaries>
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</ResourceDictionary>
</UserControl.Resources>
Expand Down
385 changes: 379 additions & 6 deletions src/MahApps.Metro/MahApps.Metro.Shared/Controls/Helper/SliderHelper.cs

Large diffs are not rendered by default.

89 changes: 52 additions & 37 deletions src/MahApps.Metro/MahApps.Metro.Shared/Controls/RangeSlider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ namespace MahApps.Metro.Controls
/// A slider control with the ability to select a range between two values.
/// </summary>
[DefaultEvent("RangeSelectionChanged"),
TemplatePart(Name = "PART_Container", Type = typeof(StackPanel)),
TemplatePart(Name = "PART_Container", Type = typeof(FrameworkElement)),
TemplatePart(Name = "PART_RangeSliderContainer", Type = typeof(StackPanel)),
TemplatePart(Name = "PART_LeftEdge", Type = typeof(RepeatButton)),
TemplatePart(Name = "PART_RightEdge", Type = typeof(RepeatButton)),
TemplatePart(Name = "PART_LeftThumb", Type = typeof(Thumb)),
TemplatePart(Name = "PART_MiddleThumb", Type = typeof(Thumb)),
TemplatePart(Name = "PART_PART_TopTick", Type = typeof(TickBar)),
TemplatePart(Name = "PART_PART_BottomTick", Type = typeof(TickBar)),
TemplatePart(Name = "PART_RightThumb", Type = typeof(Thumb))]
TemplatePart(Name = "PART_RightThumb", Type = typeof(Thumb)),
TemplatePart(Name = "PART_RightEdge", Type = typeof(RepeatButton))]
public class RangeSlider : RangeBase
{
#region Routed UI commands
Expand Down Expand Up @@ -392,7 +390,7 @@ public Double MinRange
private RepeatButton _leftButton;
private RepeatButton _rightButton;
private StackPanel _visualElementsContainer;
private StackPanel _container;
private FrameworkElement _container;
private Double _movableWidth;
private readonly DispatcherTimer _timer;

Expand Down Expand Up @@ -885,44 +883,61 @@ private void OnRangeSelectionChanged(RangeSelectionChangedEventArgs e)
public override void OnApplyTemplate()
{
base.OnApplyTemplate();
_container = EnforceInstance<StackPanel>("PART_Container");
_visualElementsContainer = EnforceInstance<StackPanel>("PART_RangeSliderContainer");
_centerThumb = EnforceInstance<Thumb>("PART_MiddleThumb");
_leftButton = EnforceInstance<RepeatButton>("PART_LeftEdge");
_rightButton = EnforceInstance<RepeatButton>("PART_RightEdge");
_leftThumb = EnforceInstance<Thumb>("PART_LeftThumb");
_rightThumb = EnforceInstance<Thumb>("PART_RightThumb");

_container = GetTemplateChild("PART_Container") as FrameworkElement;
_visualElementsContainer = GetTemplateChild("PART_RangeSliderContainer") as StackPanel;
_centerThumb = GetTemplateChild("PART_MiddleThumb") as Thumb;
_leftButton = GetTemplateChild("PART_LeftEdge") as RepeatButton;
_rightButton = GetTemplateChild("PART_RightEdge") as RepeatButton;
_leftThumb = GetTemplateChild("PART_LeftThumb") as Thumb;
_rightThumb = GetTemplateChild("PART_RightThumb") as Thumb;

InitializeVisualElementsContainer();
ReCalculateSize();
}

//Get element from name. If it exist then element instance return, if not, new will be created
private T EnforceInstance<T>(string partName) where T : FrameworkElement, new()
{
var element = GetTemplateChild(partName) as T ?? new T();
return element;
}

//adds visual element to the container
private void InitializeVisualElementsContainer()
{
_leftThumb.DragCompleted += LeftThumbDragComplete;
_rightThumb.DragCompleted += RightThumbDragComplete;
_leftThumb.DragStarted += LeftThumbDragStart;
_rightThumb.DragStarted += RightThumbDragStart;
_centerThumb.DragStarted += CenterThumbDragStarted;
_centerThumb.DragCompleted += CenterThumbDragCompleted;

//handle the drag delta events
_centerThumb.DragDelta += CenterThumbDragDelta;
_leftThumb.DragDelta += LeftThumbDragDelta;
_rightThumb.DragDelta += RightThumbDragDelta;

_visualElementsContainer.PreviewMouseDown += VisualElementsContainerPreviewMouseDown;
_visualElementsContainer.PreviewMouseUp += VisualElementsContainerPreviewMouseUp;
_visualElementsContainer.MouseLeave += VisualElementsContainerMouseLeave;

_visualElementsContainer.MouseDown += VisualElementsContainerMouseDown;
if (_visualElementsContainer != null
&& _leftThumb != null
&& _rightThumb != null
&& _centerThumb != null)
{
_leftThumb.DragCompleted -= LeftThumbDragComplete;
_rightThumb.DragCompleted -= RightThumbDragComplete;
_leftThumb.DragStarted -= LeftThumbDragStart;
_rightThumb.DragStarted -= RightThumbDragStart;
_centerThumb.DragStarted -= CenterThumbDragStarted;
_centerThumb.DragCompleted -= CenterThumbDragCompleted;

//handle the drag delta events
_centerThumb.DragDelta -= CenterThumbDragDelta;
_leftThumb.DragDelta -= LeftThumbDragDelta;
_rightThumb.DragDelta -= RightThumbDragDelta;

_visualElementsContainer.PreviewMouseDown -= VisualElementsContainerPreviewMouseDown;
_visualElementsContainer.PreviewMouseUp -= VisualElementsContainerPreviewMouseUp;
_visualElementsContainer.MouseLeave -= VisualElementsContainerMouseLeave;
_visualElementsContainer.MouseDown -= VisualElementsContainerMouseDown;

_leftThumb.DragCompleted += LeftThumbDragComplete;
_rightThumb.DragCompleted += RightThumbDragComplete;
_leftThumb.DragStarted += LeftThumbDragStart;
_rightThumb.DragStarted += RightThumbDragStart;
_centerThumb.DragStarted += CenterThumbDragStarted;
_centerThumb.DragCompleted += CenterThumbDragCompleted;

//handle the drag delta events
_centerThumb.DragDelta += CenterThumbDragDelta;
_leftThumb.DragDelta += LeftThumbDragDelta;
_rightThumb.DragDelta += RightThumbDragDelta;

_visualElementsContainer.PreviewMouseDown += VisualElementsContainerPreviewMouseDown;
_visualElementsContainer.PreviewMouseUp += VisualElementsContainerPreviewMouseUp;
_visualElementsContainer.MouseLeave += VisualElementsContainerMouseLeave;
_visualElementsContainer.MouseDown += VisualElementsContainerMouseDown;
}
}

//Handler for preview mouse button down for the whole StackPanel container
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Amber.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<Color x:Key="MenuShadowColor">#FFFFFFFF</Color>

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource Gray7}" options:Freeze="True" />

<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="#FF999999" options:Freeze="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<Color x:Key="MenuShadowColor">#FF000000</Color>

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource Gray7}" options:Freeze="True" />

<SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="#FF666666" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Blue.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Brown.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Cobalt.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Cyan.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Green.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Indigo.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Lime.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Mauve.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Olive.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Orange.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Pink.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Purple.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Red.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Sienna.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Steel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Taupe.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Teal.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/MahApps.Metro/Styles/Accents/Violet.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />

<!-- DataGrid brushes -->

<SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
<SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
Expand Down
Loading