Skip to content

Update Material Design Theme to use new brush names as per MaterialDesignInXaml 5.0.0 #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjmurph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Material Design Theme to use new brush names as per MaterialDesignInXaml 5.0.0 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions Dragablz/Themes/MaterialDesign.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
<Setter Property="Width" Value="12" />
<Setter Property="Height" Value="12" />
<Setter Property="Margin" Value="4 0 2 0" />
<Setter Property="Opacity" Value=".75" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Foreground}" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
<Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}"/>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Light.Foreground}" />
</Trigger>
</Style.Triggers>
</Style>
Expand All @@ -129,15 +129,15 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
<Setter Property="Width" Value="12" />
<Setter Property="Height" Value="12" />
<Setter Property="Margin" Value="4 0 2 0" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Foreground}" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}" />
<Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}"/>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Light.Foreground}" />
</Trigger>
</Style.Triggers>
</Style>
Expand All @@ -146,10 +146,10 @@

<Style x:Key="MaterialDesignDragableTabItemStyle" TargetType="{x:Type dragablz:DragablzItem}">
<Setter Property="FocusVisualStyle" Value="{StaticResource MaterialDesignFocusVisual}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Foreground}"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource SecondaryHueMidBrush}" />
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource MaterialDesign.Brush.Secondary}" />
<Setter Property="Margin" Value="0 0 0 0"/>
<Setter Property="Padding" Value="8"/>
<Setter Property="MinWidth" Value="80" />
Expand Down Expand Up @@ -216,7 +216,7 @@

<Style x:Key="MaterialDesignDragableTabItemVerticalStyle" TargetType="{x:Type dragablz:DragablzItem}">
<Setter Property="FocusVisualStyle" Value="{StaticResource MaterialDesignFocusVisual}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Foreground}"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Margin" Value="0 0 0 0"/>
Expand Down Expand Up @@ -267,7 +267,7 @@
</Grid>
</local:Ripple>
</Border>
<Border x:Name="SelectionHighlightBorder" Background="{DynamicResource SecondaryHueMidBrush}" Width="2"
<Border x:Name="SelectionHighlightBorder" Background="{DynamicResource MaterialDesign.Brush.Secondary}" Width="2"
Grid.Column="1"
Visibility="Hidden"/>
</Grid>
Expand Down Expand Up @@ -575,7 +575,7 @@

<Style TargetType="{x:Type dragablz:TabablzControl}" x:Key="MaterialDesignTabablzControlStyle">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
<Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignDragableTabItemStyle}" />
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -756,41 +756,41 @@
</Style>

<Style x:Key="MaterialDesignAlternateDragableTabItemStyle" TargetType="{x:Type dragablz:DragablzItem}" BasedOn="{StaticResource MaterialDesignDragableTabItemStyle}">
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignColumnHeader}"/>
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Header.Foreground}"/>
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="False" />
<Condition Property="IsMouseOver" Value="True" />
</MultiTrigger.Conditions>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Foreground}" />
</MultiTrigger>
</Style.Triggers>
</Style>

<Style x:Key="MaterialDesignAlternateDragableTabItemVerticalStyle" TargetType="{x:Type dragablz:DragablzItem}" BasedOn="{StaticResource MaterialDesignDragableTabItemVerticalStyle}">
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignColumnHeader}"/>
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Header.Foreground}"/>
<Setter Property="local:MaterialDesignAssist.IndicatorBrush" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsSelected" Value="False" />
<Condition Property="IsMouseOver" Value="True" />
</MultiTrigger.Conditions>
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Foreground}" />
</MultiTrigger>
</Style.Triggers>
</Style>

<Style TargetType="{x:Type dragablz:TabablzControl}" x:Key="MaterialDesignAlternateTabablzControlStyle" BasedOn="{StaticResource MaterialDesignTabablzControlStyle}">
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignPaper}" />
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Background}" />
<Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignAlternateDragableTabItemStyle}" />
<Style.Triggers>
<Trigger Property="TabStripPlacement" Value="Left">
Expand Down
Loading