DisabledBorderBrush in Monotone.ExtendedWPFToolkit.xaml added

steto-scope · Jan 17, 2015 · f82e321 · f82e321
1 parent 0845a0d
commit f82e321
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 21 deletions.
diff --git a/Monotone/Monotone.ExtendedWPFToolkit.xaml b/Monotone/Monotone.ExtendedWPFToolkit.xaml
@@ -89,8 +89,8 @@
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource BaseBorderBrush}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource BaseBorderBrush}" />
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                             <!--<Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource BaseBrush}" />
                             <Setter TargetName="InnerBorder" Property="Background" Value="{DynamicResource BaseBrush}" />-->
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
@@ -474,6 +474,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                             <Setter Property="Background" Value="{DynamicResource BaseBrush}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
@@ -533,7 +534,7 @@
                             <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource DarkerSelectedBrush}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource BaseBorderBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource BaseBrush}" />
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                         </Trigger>
@@ -566,6 +567,7 @@
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                             <Setter Property="Background" Value="{DynamicResource BaseBrush}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="BorderBrush" Value="{DynamicResource SelectedBrush}" />
@@ -744,10 +746,17 @@
                                 </Grid>
                             </Border>
                         </Grid>
+
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+
     </Style>
     <Style TargetType="{x:Type xtk:ColorSpectrumSlider}">
         <Setter Property="Orientation" Value="Vertical" />
@@ -952,22 +961,22 @@
                             <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
                         </Trigger>
-
                         <Trigger Property="ColorMode" Value="ColorPalette">
                             <Setter TargetName="_colorPaletteHost" Property="Visibility" Value="Visible" />
                             <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_ColorModeButton" Property="Content" Value="Advanced" />
                         </Trigger>
-
                         <Trigger Property="ColorMode" Value="ColorCanvas">
                             <Setter TargetName="_colorPaletteHost" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_ColorModeButton" Property="Content" Value="Standard" />
                         </Trigger>
-
                         <Trigger Property="ShowDropDownButton" Value="False">
                             <Setter Property="BorderThickness" Value="1" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="PART_ColorPickerToggleButton" />
+                        </Trigger>
 
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1268,6 +1277,9 @@
                             <Setter TargetName="PART_Display" Property="Background" Value="{DynamicResource DarkerBaseBrush}" />
                             <Setter TargetName="PART_Display" Property="BorderBrush" Value="{DynamicResource DarkerSelectedBrush}" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -1314,6 +1326,9 @@
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource BaseBorderBrush}" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -1357,7 +1372,7 @@
                             </Popup>
 
                             <Border>
-                                <ToggleButton x:Name="PART_DropDownButton"  Content="{TemplateBinding Text}"  Background="{TemplateBinding Background}" MinWidth="22" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ToolkitToggleButton}" Padding="0" IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                                <ToggleButton x:Name="PART_DropDownButton"  Content="{TemplateBinding Text}" BorderBrush="{TemplateBinding BorderBrush}"  Background="{TemplateBinding Background}" MinWidth="22" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ToolkitToggleButton}" Padding="0" IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
                             </Border>
                         </Grid>
                     </Border>
@@ -1369,6 +1384,7 @@
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                             <Setter TargetName="PART_DropDownButton" Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                             <Setter Property="Background" Value="{DynamicResource BaseBrush}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1394,6 +1410,7 @@
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Background" Value="{DynamicResource BaseBrush}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                             <Setter Property="Foreground" Value="{DynamicResource DisabledBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -1518,6 +1535,9 @@
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -1683,6 +1703,8 @@
                             <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource DisabledBrush}" />
                             <Setter Property="Background" TargetName="ActionButtonChrome" Value="{DynamicResource BaseBrush}" />
                             <Setter Property="Background" TargetName="ControlChrome" Value="{DynamicResource BaseBrush}" />
+                            <Setter Property="BorderBrush" TargetName="ControlChrome" Value="{DynamicResource DisabledBorderBrush}" />
+                            <Setter Property="BorderBrush" TargetName="ActionButtonChrome" Value="{DynamicResource DisabledBorderBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -2526,6 +2548,7 @@
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Background" Value="{DynamicResource BaseBrush}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -2599,9 +2622,9 @@
                         </Popup>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <!--<Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Background" TargetName="popupgrid" Value="{DynamicResource BaseBrush}" />
-                        </Trigger>-->
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="BorderBrush" TargetName="PART_DropDownButton" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -2646,7 +2669,7 @@
             </MultiDataTrigger>
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Fill" TargetName="MainBorder" Value="{DynamicResource BaseBrush}" />
-                <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource BaseBorderBrush}" />
+                <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource DisabledBorderBrush}" />
             </Trigger>
             <Trigger Property="IsDragging" Value="True">
                 <Setter TargetName="MainBorder" Property="Stroke" Value="{DynamicResource DarkerSelectedBrush}" />
@@ -2676,7 +2699,7 @@
             </MultiDataTrigger>
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Fill" TargetName="MainBorder" Value="{DynamicResource BaseBrush}" />
-                <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource BaseBorderBrush}" />
+                <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource DisabledBorderBrush}" />
             </Trigger>
             <Trigger Property="IsDragging" Value="True">
                 <Setter TargetName="MainBorder" Property="Stroke" Value="{DynamicResource DarkerSelectedBrush}" />
@@ -2732,7 +2755,7 @@
                 <ColumnDefinition Width="Auto" MinWidth="50" />
             </Grid.ColumnDefinitions>
 
-            <Border Grid.Column="1" Grid.Row="1" Grid.RowSpan="3"  Background="{DynamicResource BaseBorderBrush}" VerticalAlignment="Stretch" HorizontalAlignment="Center" Width="2" />
+            <Border Grid.Column="1" Grid.Row="1" Grid.RowSpan="3"  Background="{DynamicResource BaseBorderBrush}" VerticalAlignment="Stretch" HorizontalAlignment="Center" Width="2" Name="b" />
 
             <RepeatButton x:Name="PART_LowerRange" Height="{TemplateBinding LowerRangeWidth}" Width="15" Grid.Column="1" Grid.Row="3" Background="{TemplateBinding LowerRangeBackground}" Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}" SnapsToDevicePixels="True" />
 
@@ -2742,7 +2765,7 @@
 <Slider x:Name="PART_LowerSlider" Grid.Column="1" Orientation="Vertical" Grid.RowSpan="5" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type xtk:RangeSlider}}, Mode=TwoWay, Path=LowerValue, StringFormat=\{0:00.00\}}">
                 <Slider.Template>
                     <ControlTemplate TargetType="{x:Type Slider}">
-                        <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Name="b">
                             <Grid>
                                 <Track x:Name="PART_Track">
                                     <Track.Thumb>
@@ -2773,7 +2796,7 @@
                                                         </Trigger>
                                                         <Trigger Property="IsEnabled" Value="false">
                                                             <Setter Property="Fill" TargetName="MainBorder" Value="{DynamicResource BaseBrush}" />
-                                                            <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource BaseBorderBrush}" />
+                                                            <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource DisabledBorderBrush}" />
                                                         </Trigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
@@ -2789,7 +2812,7 @@
 <Slider x:Name="PART_HigherSlider" Grid.Column="1" Grid.RowSpan="5" Orientation="Vertical" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type xtk:RangeSlider}}, Mode=TwoWay, Path=HigherValue, StringFormat=\{0:00.00\}}">
                 <Slider.Template>
                     <ControlTemplate TargetType="{x:Type Slider}">
-                        <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Border SnapsToDevicePixels="true" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Name="b">
                             <Grid>
                                 <Track x:Name="PART_Track">
                                     <Track.Thumb>
@@ -2820,7 +2843,7 @@
                                                         </Trigger>
                                                         <Trigger Property="IsEnabled" Value="false">
                                                             <Setter Property="Fill" TargetName="MainBorder" Value="{DynamicResource BaseBrush}" />
-                                                            <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource BaseBorderBrush}" />
+                                                            <Setter Property="Stroke" TargetName="MainBorder" Value="{DynamicResource DisabledBorderBrush}" />
                                                         </Trigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
@@ -2829,13 +2852,19 @@
                                     </Track.Thumb>
                                 </Track>
                             </Grid>
-                        </Border>
+                        </Border>                        
                     </ControlTemplate>
                 </Slider.Template>
             </Slider>
         </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Background" TargetName="b" Value="{DynamicResource DisabledBorderBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
     </ControlTemplate>
     <Style TargetType="{x:Type xtk:RangeSlider}">
+        <Setter Property="BorderBrush" Value="{DynamicResource BaseBorderBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type xtk:RangeSlider}">
@@ -2857,7 +2886,7 @@
                             <ColumnDefinition Width="{Binding ., ElementName=PART_HigherSlider, Converter={StaticResource SliderThumbWidthConverter}, ConverterParameter=0}" />
                         </Grid.ColumnDefinitions>
 
-                        <Border Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Background="{DynamicResource LighterBaseBrush}" VerticalAlignment="Center" Height="2" />
+                        <Border Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Background="{TemplateBinding BorderBrush}" VerticalAlignment="Center" Height="2" />
 
                         <RepeatButton x:Name="PART_LowerRange" Width="{TemplateBinding LowerRangeWidth}" Grid.Column="1" Grid.Row="1" Background="{TemplateBinding LowerRangeBackground}" Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}" SnapsToDevicePixels="True" />
 
@@ -2873,6 +2902,11 @@
                         <Slider x:Name="PART_HigherSlider" Grid.Row="1" Grid.ColumnSpan="5" Template="{StaticResource HigherSliderTemplate}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type xtk:RangeSlider}}, Mode=TwoWay, Path=HigherValue, StringFormat=\{0:00.00\}}">
                         </Slider>
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>