Skip to content

Commit a8f1d65

Browse files
committed
Merge branch 'addStyles' into fluent/exp/all-styles
2 parents 0a13a85 + c4383a7 commit a8f1d65

19 files changed

+2283
-0
lines changed

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/PresentationFramework.Fluent.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
</ProjectReference>
4343
</ItemGroup>
4444

45+
<ItemGroup>
46+
<Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
47+
<Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
48+
</ItemGroup>
49+
4550
<!-- Minimal set of .NET core references -->
4651
<ItemGroup>
4752
<NetCoreReference Include="netstandard" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Fluent.xaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,41 @@
1212
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/Fonts.xaml" />
1313
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/StaticColors.xaml" />
1414
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/Variables.xaml" />
15+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/BrowserWindow.xaml" />
1516
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Button.xaml" />
1617
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Calendar.xaml" />
1718
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/CheckBox.xaml" />
19+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/CollectionViewGroup.xaml" />
1820
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ComboBox.xaml" />
21+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ContentControl.xaml" />
1922
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ContextMenu.xaml" />
23+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Control.xaml" />
2024
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/DataGrid.xaml" />
2125
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/DatePicker.xaml" />
26+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/DocumentViewer.xaml" />
2227
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Expander.xaml" />
2328
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Frame.xaml" />
29+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/GridSplitter.xaml" />
30+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/GroupBox.xaml" />
31+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/GroupItem.xaml" />
32+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/GridViewColumnHeader.xaml" />
33+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/HeaderedContentControl.xaml" />
34+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Hyperlink.xaml" />
35+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ItemsControl.xaml" />
2436
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Label.xaml" />
2537
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ListBox.xaml" />
2638
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ListBoxItem.xaml" />
2739
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ListView.xaml" />
2840
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ListViewItem.xaml" />
2941
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Menu.xaml" />
3042
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/MenuItem.xaml" />
43+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/NavigationWindow.xaml" />
3144
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Page.xaml" />
3245
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/PasswordBox.xaml" />
3346
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ProgressBar.xaml" />
3447
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/RadioButton.xaml" />
3548
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/RepeatButton.xaml" />
49+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ResizeGrip.xaml" />
3650
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/RichTextBox.xaml" />
3751
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ScrollBar.xaml" />
3852
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ScrollViewer.xaml" />
@@ -42,11 +56,13 @@
4256
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/TabControl.xaml" />
4357
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/TextBlock.xaml" />
4458
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/TextBox.xaml" />
59+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Thumb.xaml" />
4560
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ToggleButton.xaml" />
4661
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ToolBar.xaml" />
4762
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/ToolTip.xaml" />
4863
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/TreeView.xaml" />
4964
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/TreeViewItem.xaml" />
65+
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/UserControl.xaml" />
5066
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Styles/Window.xaml" />
5167
</ResourceDictionary.MergedDictionaries>
5268
</ResourceDictionary>

0 commit comments

Comments
 (0)