File tree Expand file tree Collapse file tree 6 files changed +121
-1
lines changed
src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent Expand file tree Collapse file tree 6 files changed +121
-1
lines changed Original file line number Diff line number Diff line change
1
+ <ResourceDictionary
2
+ xmlns =" http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3
+ xmlns : x =" http://schemas.microsoft.com/winfx/2006/xaml"
4
+ xmlns : system =" clr-namespace:System;assembly=System.Runtime" >
5
+ <Style x : Key =" DefaultItemsControlStyle" TargetType =" {x:Type ItemsControl}" >
6
+ <Setter Property =" Template" >
7
+ <Setter .Value>
8
+ <ControlTemplate TargetType =" {x:Type ItemsControl}" >
9
+ <Border Background =" {TemplateBinding Background}"
10
+ BorderBrush =" {TemplateBinding BorderBrush}"
11
+ BorderThickness =" {TemplateBinding BorderThickness}"
12
+ Padding =" {TemplateBinding Padding}"
13
+ SnapsToDevicePixels =" true" >
14
+ <ItemsPresenter SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
15
+ </Border >
16
+ </ControlTemplate >
17
+ </Setter .Value>
18
+ </Setter >
19
+ </Style >
20
+
21
+ <Style BasedOn =" {StaticResource DefaultItemsControlStyle}" TargetType =" {x:Type ItemsControl}" />
22
+ </ResourceDictionary >
Original file line number Diff line number Diff line change 5
5
All Rights Reserved.
6
6
-->
7
7
8
- <ResourceDictionary xmlns =" http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns : x =" http://schemas.microsoft.com/winfx/2006/xaml" >
8
+ <ResourceDictionary
9
+ xmlns =" http://schemas.microsoft.com/winfx/2006/xaml/presentation"
10
+ xmlns : x =" http://schemas.microsoft.com/winfx/2006/xaml" >
9
11
10
12
<Style x : Key =" DefaultLabelStyle" TargetType =" {x:Type Label}" >
11
13
<Setter Property =" Padding" Value =" 0,0,0,4" />
Original file line number Diff line number Diff line change
1
+ <ResourceDictionary
2
+ xmlns =" http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3
+ xmlns : x =" http://schemas.microsoft.com/winfx/2006/xaml"
4
+ xmlns : system =" clr-namespace:System;assembly=System.Runtime" >
5
+ <Style x : Key =" DefaultUserControlStyle" TargetType =" {x:Type UserControl}" >
6
+ <Setter Property =" Template" >
7
+ <Setter .Value>
8
+ <ControlTemplate TargetType =" {x:Type UserControl}" >
9
+ <Border Background =" {TemplateBinding Background}"
10
+ BorderBrush =" {TemplateBinding BorderBrush}"
11
+ BorderThickness =" {TemplateBinding BorderThickness}"
12
+ Padding =" {TemplateBinding Padding}"
13
+ SnapsToDevicePixels =" true" >
14
+ <ContentPresenter HorizontalAlignment =" {TemplateBinding HorizontalContentAlignment}"
15
+ VerticalAlignment =" {TemplateBinding VerticalContentAlignment}"
16
+ SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
17
+ </Border >
18
+ </ControlTemplate >
19
+ </Setter .Value>
20
+ </Setter >
21
+ </Style >
22
+
23
+ <Style BasedOn =" {StaticResource DefaultUserControlStyle}" TargetType =" {x:Type UserControl}" />
24
+ </ResourceDictionary >
Original file line number Diff line number Diff line change 2674
2674
</Setter .Value>
2675
2675
</Setter >
2676
2676
</Style >
2677
+ <Style x : Key =" DefaultItemsControlStyle" TargetType =" {x:Type ItemsControl}" >
2678
+ <Setter Property =" Template" >
2679
+ <Setter .Value>
2680
+ <ControlTemplate TargetType =" {x:Type ItemsControl}" >
2681
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
2682
+ <ItemsPresenter SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
2683
+ </Border >
2684
+ </ControlTemplate >
2685
+ </Setter .Value>
2686
+ </Setter >
2687
+ </Style >
2688
+ <Style BasedOn =" {StaticResource DefaultItemsControlStyle}" TargetType =" {x:Type ItemsControl}" />
2677
2689
<Style x : Key =" DefaultLabelStyle" TargetType =" {x:Type Label}" >
2678
2690
<Setter Property =" Padding" Value =" 0,0,0,4" />
2679
2691
<Setter Property =" Focusable" Value =" False" />
4816
4828
</Style .Triggers>
4817
4829
</Style >
4818
4830
<Style BasedOn =" {StaticResource DefaultTreeViewItemStyle}" TargetType =" {x:Type TreeViewItem}" />
4831
+ <Style x : Key =" DefaultUserControlStyle" TargetType =" {x:Type UserControl}" >
4832
+ <Setter Property =" Template" >
4833
+ <Setter .Value>
4834
+ <ControlTemplate TargetType =" {x:Type UserControl}" >
4835
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
4836
+ <ContentPresenter HorizontalAlignment =" {TemplateBinding HorizontalContentAlignment}" VerticalAlignment =" {TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
4837
+ </Border >
4838
+ </ControlTemplate >
4839
+ </Setter .Value>
4840
+ </Setter >
4841
+ </Style >
4842
+ <Style BasedOn =" {StaticResource DefaultUserControlStyle}" TargetType =" {x:Type UserControl}" />
4819
4843
<ControlTemplate x : Key =" WindowTemplateKey" TargetType =" {x:Type Window}" >
4820
4844
<Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" >
4821
4845
<Grid >
Original file line number Diff line number Diff line change 2655
2655
</Setter .Value>
2656
2656
</Setter >
2657
2657
</Style >
2658
+ <Style x : Key =" DefaultItemsControlStyle" TargetType =" {x:Type ItemsControl}" >
2659
+ <Setter Property =" Template" >
2660
+ <Setter .Value>
2661
+ <ControlTemplate TargetType =" {x:Type ItemsControl}" >
2662
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
2663
+ <ItemsPresenter SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
2664
+ </Border >
2665
+ </ControlTemplate >
2666
+ </Setter .Value>
2667
+ </Setter >
2668
+ </Style >
2669
+ <Style BasedOn =" {StaticResource DefaultItemsControlStyle}" TargetType =" {x:Type ItemsControl}" />
2658
2670
<Style x : Key =" DefaultLabelStyle" TargetType =" {x:Type Label}" >
2659
2671
<Setter Property =" Padding" Value =" 0,0,0,4" />
2660
2672
<Setter Property =" Focusable" Value =" False" />
4797
4809
</Style .Triggers>
4798
4810
</Style >
4799
4811
<Style BasedOn =" {StaticResource DefaultTreeViewItemStyle}" TargetType =" {x:Type TreeViewItem}" />
4812
+ <Style x : Key =" DefaultUserControlStyle" TargetType =" {x:Type UserControl}" >
4813
+ <Setter Property =" Template" >
4814
+ <Setter .Value>
4815
+ <ControlTemplate TargetType =" {x:Type UserControl}" >
4816
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
4817
+ <ContentPresenter HorizontalAlignment =" {TemplateBinding HorizontalContentAlignment}" VerticalAlignment =" {TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
4818
+ </Border >
4819
+ </ControlTemplate >
4820
+ </Setter .Value>
4821
+ </Setter >
4822
+ </Style >
4823
+ <Style BasedOn =" {StaticResource DefaultUserControlStyle}" TargetType =" {x:Type UserControl}" />
4800
4824
<ControlTemplate x : Key =" WindowTemplateKey" TargetType =" {x:Type Window}" >
4801
4825
<Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" >
4802
4826
<Grid >
Original file line number Diff line number Diff line change 2671
2671
</Setter .Value>
2672
2672
</Setter >
2673
2673
</Style >
2674
+ <Style x : Key =" DefaultItemsControlStyle" TargetType =" {x:Type ItemsControl}" >
2675
+ <Setter Property =" Template" >
2676
+ <Setter .Value>
2677
+ <ControlTemplate TargetType =" {x:Type ItemsControl}" >
2678
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
2679
+ <ItemsPresenter SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
2680
+ </Border >
2681
+ </ControlTemplate >
2682
+ </Setter .Value>
2683
+ </Setter >
2684
+ </Style >
2685
+ <Style BasedOn =" {StaticResource DefaultItemsControlStyle}" TargetType =" {x:Type ItemsControl}" />
2674
2686
<Style x : Key =" DefaultLabelStyle" TargetType =" {x:Type Label}" >
2675
2687
<Setter Property =" Padding" Value =" 0,0,0,4" />
2676
2688
<Setter Property =" Focusable" Value =" False" />
4813
4825
</Style .Triggers>
4814
4826
</Style >
4815
4827
<Style BasedOn =" {StaticResource DefaultTreeViewItemStyle}" TargetType =" {x:Type TreeViewItem}" />
4828
+ <Style x : Key =" DefaultUserControlStyle" TargetType =" {x:Type UserControl}" >
4829
+ <Setter Property =" Template" >
4830
+ <Setter .Value>
4831
+ <ControlTemplate TargetType =" {x:Type UserControl}" >
4832
+ <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" Padding =" {TemplateBinding Padding}" SnapsToDevicePixels =" true" >
4833
+ <ContentPresenter HorizontalAlignment =" {TemplateBinding HorizontalContentAlignment}" VerticalAlignment =" {TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels =" {TemplateBinding SnapsToDevicePixels}" />
4834
+ </Border >
4835
+ </ControlTemplate >
4836
+ </Setter .Value>
4837
+ </Setter >
4838
+ </Style >
4839
+ <Style BasedOn =" {StaticResource DefaultUserControlStyle}" TargetType =" {x:Type UserControl}" />
4816
4840
<ControlTemplate x : Key =" WindowTemplateKey" TargetType =" {x:Type Window}" >
4817
4841
<Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" >
4818
4842
<Grid >
You can’t perform that action at this time.
0 commit comments