Skip to content

Commit e7d1446

Browse files
aroniumaronium
committed
Added Gray color scheme
1 parent 795b34e commit e7d1446

File tree

5 files changed

+69
-7
lines changed

5 files changed

+69
-7
lines changed

‎Aronium.Wpf.Toolkit.Demo/App.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ResourceDictionary Source="pack://application:,,,/Aronium.Wpf.Toolkit;component/Themes/Brushes/Dimmed.xaml"/>
1010
<ResourceDictionary Source="pack://application:,,,/Aronium.Wpf.Toolkit;component/Themes/Brushes/Light.xaml"/>
1111
<ResourceDictionary Source="pack://application:,,,/Aronium.Wpf.Toolkit;component/Themes/Brushes/HighContrast.xaml"/>
12+
<ResourceDictionary Source="pack://application:,,,/Aronium.Wpf.Toolkit;component/Themes/Brushes/Gray.xaml"/>
1213
<ResourceDictionary Source="pack://application:,,,/Aronium.Wpf.Toolkit;component/Themes/Generic.xaml"/>
1314
</ResourceDictionary.MergedDictionaries>
1415
</ResourceDictionary>

‎Aronium.Wpf.Toolkit.Demo/MainWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public MainWindow()
3232
{
3333
InitializeComponent();
3434

35-
Themes = new List<string>(new[] { "Light", "Dark", "Dimmed", "HighContrast" });
35+
Themes = new List<string>(new[] { "Light", "Dark", "Dimmed", "HighContrast", "Gray" });
3636

37-
ThemeName = "Dimmed";
37+
ThemeName = "Gray";
3838

3939
DataContext = this;
4040

‎Aronium.Wpf.Toolkit/Aronium.Wpf.Toolkit.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114
</ItemGroup>
115115
<ItemGroup />
116116
<ItemGroup>
117+
<Page Include="Themes\Brushes\Gray.xaml">
118+
<Generator>MSBuild:Compile</Generator>
119+
<SubType>Designer</SubType>
120+
</Page>
117121
<Page Include="Themes\Brushes\HighContrast.xaml">
118122
<Generator>MSBuild:Compile</Generator>
119123
<SubType>Designer</SubType>

‎Aronium.Wpf.Toolkit/Controls/GuidedTour.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ private void SetGuideItemPosition(GuidedTourItem item)
269269
var x = ((targetPoint.X - thisPoint.X) / dpiX) / Scale;
270270
var y = ((targetPoint.Y - thisPoint.Y) / dpiY) / Scale;
271271

272-
if(FlowDirection == FlowDirection.RightToLeft)
272+
if (FlowDirection == FlowDirection.RightToLeft)
273273
{
274274
x = -x;
275275
}
@@ -452,14 +452,13 @@ private void OnGuideItemTargetSelected(object sender)
452452
}
453453

454454
private void OnItemMouseLeave(object sender, MouseEventArgs e)
455-
{
456-
if (animateGuideStoryboard != null)
457-
animateGuideStoryboard.Resume();
455+
{
456+
animateGuideStoryboard?.Resume();
458457
}
459458

460459
private void OnItemMouseEnter(object sender, MouseEventArgs e)
461460
{
462-
animateGuideStoryboard.Pause();
461+
animateGuideStoryboard?.Pause();
463462
}
464463

465464
private GuidedTourItem GetGuideItem(FrameworkElement target)

‎Aronium.Wpf.Toolkit/Themes/Brushes/Gray.xaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
4+
<Color x:Key="AccentColor">#87273F</Color>
5+
<SolidColorBrush x:Key="Accent" Color="{StaticResource AccentColor}" />
6+
7+
<Color x:Key="BackgroundColor">#272a31</Color>
8+
<SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" />
9+
<Color x:Key="BackgroundDarkColor">#1c1e23</Color>
10+
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}" />
11+
<SolidColorBrush x:Key="BackgroundDisabledBrush">#364045</SolidColorBrush>
12+
<Color x:Key="BorderBrushColor">#4d515b</Color>
13+
<SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderBrushColor}" />
14+
<SolidColorBrush x:Key="BorderDisabledBrush">#999999</SolidColorBrush>
15+
<Color x:Key="ForegroundColor">#FFFFFFFF</Color>
16+
<SolidColorBrush x:Key="Foreground" Color="{StaticResource ForegroundColor}" />
17+
<Color x:Key="ForegroundDisabledColor">#FF979797</Color>
18+
<SolidColorBrush x:Key="ForegroundDisabled" Color="{StaticResource ForegroundDisabledColor}" />
19+
<SolidColorBrush x:Key="ForegroundSelected">#FFFFFFFF</SolidColorBrush>
20+
<Color x:Key="BackgroundHoverColor">#FF2c3447</Color>
21+
<SolidColorBrush x:Key="BackgroundHoverBrush" Color="{StaticResource BackgroundHoverColor}" />
22+
23+
<Color x:Key="SelectedItemForegroundColor">#FFFFFFFF</Color>
24+
<SolidColorBrush x:Key="SelectedItemForeground" Color="{StaticResource SelectedItemForegroundColor}" />
25+
<SolidColorBrush x:Key="SelectedItemBorder" Color="#74D1F0" />
26+
27+
<!--Group box-->
28+
<SolidColorBrush x:Key="GroupBoxHeaderBackgroundBrush" Color="{StaticResource AccentColor}" />
29+
<SolidColorBrush x:Key="GroupBoxHeaderForegroundBrush" Color="#FFFFFFFF" />
30+
31+
<!-- Scroll Bar -->
32+
<SolidColorBrush x:Key="ScrollBarMouseDownBrush" Color="#FFECECEC"/>
33+
<SolidColorBrush x:Key="ScrollbarGlyphBrush" Color="#FF9C9A9A" />
34+
<SolidColorBrush x:Key="ScrollbarGlyphMouseOver" Color="#FFC7C7C7"/>
35+
36+
<!--On off button-->
37+
<SolidColorBrush x:Key="OnOffButtonSliderBackground" Color="#FF0E1C28" />
38+
<SolidColorBrush x:Key="OnOffButtonSliderBackgroundChecked" Color="#56BE00" />
39+
<SolidColorBrush x:Key="OnOffButtonBorderBrush" Color="#FF28323C" />
40+
<SolidColorBrush x:Key="OnOffButtonBorderBrushCheked" Color="#FF28323C" />
41+
<SolidColorBrush x:Key="OnOffButtonThumbBackground" Color="White" />
42+
<SolidColorBrush x:Key="OnOffButtonThumbBackgroundChecked" Color="White" />
43+
44+
<!--Datagrid-->
45+
<Color x:Key="DataGridBackgroundHoverBrushColor">#101923</Color>
46+
<SolidColorBrush x:Key="DataGridBackgroundBrush" Color="{StaticResource BackgroundDarkColor}" />
47+
<SolidColorBrush x:Key="DataGridBackgroundHoverBrush" Color="{StaticResource DataGridBackgroundHoverBrushColor}" />
48+
<SolidColorBrush x:Key="DataGridLineBrush" Color="#FF373A36" />
49+
<SolidColorBrush x:Key="DataGridColumnHeaderBorderBrush" Color="{StaticResource BorderBrushColor}" />
50+
51+
<!--Closable tab control-->
52+
<SolidColorBrush x:Key="CloseTabItemBackgroundHover" Color="{StaticResource BackgroundHoverColor}" />
53+
54+
<!--Tags-->
55+
<SolidColorBrush x:Key="TagItemBackground" Color="{StaticResource AccentColor}" />
56+
<SolidColorBrush x:Key="TagItemBackgroundSelected" Color="#1b749c" />
57+
58+
</ResourceDictionary>

0 commit comments

Comments
 (0)