463 WamWooWam.Wpf/Interop.cs
View file

Large diffs are not rendered by default.

12 WamWooWam.Wpf/Themes.cs
View file
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -51,6 +52,8 @@ private static void LoadTheme(ThemeConfiguration config, ResourceDictionary curr
{
CurrentConfiguration = config;

var asm = Assembly.GetExecutingAssembly().GetName();

current["SystemFontFamily"] = config.FontFamily;
current["SystemFontSize"] = config.FontSize;

@@ -68,7 +71,7 @@ private static void LoadTheme(ThemeConfiguration config, ResourceDictionary curr
}
else
{
current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri("pack://application:,,,/WamWooWam.Wpf;component/Themes/LightColours.xaml", UriKind.Absolute) });
current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri($"pack://application:,,,/{asm.Name};component/Themes/LightColours.xaml", UriKind.Absolute) });
}
}
else
@@ -82,7 +85,7 @@ private static void LoadTheme(ThemeConfiguration config, ResourceDictionary curr
}
else
{
current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri("pack://application:,,,/WamWooWam.Wpf;component/Themes/DarkColours.xaml", UriKind.Absolute) });
current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri($"pack://application:,,,/{asm.Name};component/Themes/DarkColours.xaml", UriKind.Absolute) });
}
}

@@ -102,7 +105,8 @@ private static void LoadTheme(ThemeConfiguration config, ResourceDictionary curr
current["SystemAccentForegroundBrush"] = new SolidColorBrush(accentLightness > 0.5 ? Colors.Black : Colors.White);
current["SystemAccentBackgroundBrush"] = new SolidColorBrush(accent) { Opacity = 0.5 };

current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri("pack://application:,,,/WamWooWam.Wpf;component/Themes/All.xaml", UriKind.Absolute) });
if (!config.NoLoad)
current.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri($"pack://application:,,,/{asm.Name};component/Themes/All.xaml", UriKind.Absolute) });
}

private static void SetColourResource(ResourceDictionary current, string colour, string trimmed)
@@ -151,6 +155,8 @@ public ThemeConfiguration(bool? light = null, Color? accentColour = null) : this
public double FontSize { get; set; }
public double MonospaceFontSize { get; set; }

public bool NoLoad { get; set; }

internal Color GetAccentColour()
{
if (AccentColour == null)
4 WamWooWam.Wpf/Themes/ComboBoxes.xaml
View file
@@ -92,7 +92,7 @@
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBoxItem}">
@@ -286,7 +286,7 @@
</ControlTemplate>

<Style TargetType="{x:Type ComboBox}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="Foreground" Value="{DynamicResource SystemBaseHighBrush}"/>
<Setter Property="Background" Value="{DynamicResource SystemChromeMediumLowBrush}"/>
<Setter Property="BorderBrush" Value="{DynamicResource SystemBaseLowBrush}"/>
53 WamWooWam.Wpf/Themes/DarkColours.xaml
View file
@@ -1,31 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<SolidColorBrush x:Key="SystemAltHighBrush" Color="{StaticResource SystemAltHighColor}"/>
<SolidColorBrush x:Key="SystemAltLowBrush" Color="{StaticResource SystemAltLowColor}"/>
<SolidColorBrush x:Key="SystemAltMediumBrush" Color="{StaticResource SystemAltMediumColor}"/>
<SolidColorBrush x:Key="SystemAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}"/>
<SolidColorBrush x:Key="SystemAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}"/>
<SolidColorBrush x:Key="SystemBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
<SolidColorBrush x:Key="SystemBaseLowBrush" Color="{StaticResource SystemBaseLowColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}"/>
<SolidColorBrush x:Key="SystemChromeHighBrush" Color="{StaticResource SystemChromeHighColor}"/>
<SolidColorBrush x:Key="SystemChromeLowBrush" Color="{StaticResource SystemChromeLowColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}"/>
<SolidColorBrush x:Key="SystemChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}"/>
<SolidColorBrush x:Key="SystemListLowBrush" Color="{StaticResource SystemListLowColor}"/>
<SolidColorBrush x:Key="SystemListMediumBrush" Color="{StaticResource SystemListMediumColor}"/>

<Color x:Key="SystemAltHighColor">#FF000000</Color>
<Color x:Key="SystemAltLowColor">#33000000</Color>
@@ -52,4 +26,31 @@
<Color x:Key="SystemChromeGrayColor">#FF767676</Color>
<Color x:Key="SystemListLowColor">#19FFFFFF</Color>
<Color x:Key="SystemListMediumColor">#33FFFFFF</Color>

<SolidColorBrush x:Key="SystemAltHighBrush" Color="{StaticResource SystemAltHighColor}"/>
<SolidColorBrush x:Key="SystemAltLowBrush" Color="{StaticResource SystemAltLowColor}"/>
<SolidColorBrush x:Key="SystemAltMediumBrush" Color="{StaticResource SystemAltMediumColor}"/>
<SolidColorBrush x:Key="SystemAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}"/>
<SolidColorBrush x:Key="SystemAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}"/>
<SolidColorBrush x:Key="SystemBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
<SolidColorBrush x:Key="SystemBaseLowBrush" Color="{StaticResource SystemBaseLowColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}"/>
<SolidColorBrush x:Key="SystemChromeHighBrush" Color="{StaticResource SystemChromeHighColor}"/>
<SolidColorBrush x:Key="SystemChromeLowBrush" Color="{StaticResource SystemChromeLowColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}"/>
<SolidColorBrush x:Key="SystemChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}"/>
<SolidColorBrush x:Key="SystemListLowBrush" Color="{StaticResource SystemListLowColor}"/>
<SolidColorBrush x:Key="SystemListMediumBrush" Color="{StaticResource SystemListMediumColor}"/>

</ResourceDictionary>
65 WamWooWam.Wpf/Themes/LightColours.xaml
View file
@@ -1,39 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<SolidColorBrush x:Key="SystemAltHighBrush" Color="{StaticResource SystemAltHighColor}"/>
<SolidColorBrush x:Key="SystemAltLowBrush" Color="{StaticResource SystemAltLowColor}"/>
<SolidColorBrush x:Key="SystemAltMediumBrush" Color="{StaticResource SystemAltMediumColor}"/>
<SolidColorBrush x:Key="SystemAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}"/>
<SolidColorBrush x:Key="SystemAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}"/>

<SolidColorBrush x:Key="SystemBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
<SolidColorBrush x:Key="SystemBaseLowBrush" Color="{StaticResource SystemBaseLowColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}"/>

<SolidColorBrush x:Key="SystemChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}"/>

<SolidColorBrush x:Key="SystemChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}"/>

<SolidColorBrush x:Key="SystemChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}"/>

<SolidColorBrush x:Key="SystemChromeHighBrush" Color="{StaticResource SystemChromeHighColor}"/>
<SolidColorBrush x:Key="SystemChromeLowBrush" Color="{StaticResource SystemChromeLowColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}"/>
<SolidColorBrush x:Key="SystemChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}"/>

<SolidColorBrush x:Key="SystemListLowBrush" Color="{StaticResource SystemListLowColor}"/>
<SolidColorBrush x:Key="SystemListMediumBrush" Color="{StaticResource SystemListMediumColor}"/>


<Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
<Color x:Key="SystemAltLowColor">#33FFFFFF</Color>
<Color x:Key="SystemAltMediumColor">#99FFFFFF</Color>
@@ -65,5 +32,37 @@

<Color x:Key="SystemListLowColor">#19000000</Color>
<Color x:Key="SystemListMediumColor">#33000000</Color>

<SolidColorBrush x:Key="SystemAltHighBrush" Color="{StaticResource SystemAltHighColor}"/>
<SolidColorBrush x:Key="SystemAltLowBrush" Color="{StaticResource SystemAltLowColor}"/>
<SolidColorBrush x:Key="SystemAltMediumBrush" Color="{StaticResource SystemAltMediumColor}"/>
<SolidColorBrush x:Key="SystemAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}"/>
<SolidColorBrush x:Key="SystemAltMediumLowBrush" Color="{StaticResource SystemAltMediumLowColor}"/>

<SolidColorBrush x:Key="SystemBaseHighBrush" Color="{StaticResource SystemBaseHighColor}"/>
<SolidColorBrush x:Key="SystemBaseLowBrush" Color="{StaticResource SystemBaseLowColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumBrush" Color="{StaticResource SystemBaseMediumColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumHighBrush" Color="{StaticResource SystemBaseMediumHighColor}"/>
<SolidColorBrush x:Key="SystemBaseMediumLowBrush" Color="{StaticResource SystemBaseMediumLowColor}"/>

<SolidColorBrush x:Key="SystemChromeAltLowBrush" Color="{StaticResource SystemChromeAltLowColor}"/>

<SolidColorBrush x:Key="SystemChromeBlackHighBrush" Color="{StaticResource SystemChromeBlackHighColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackLowBrush" Color="{StaticResource SystemChromeBlackLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumLowBrush" Color="{StaticResource SystemChromeBlackMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeBlackMediumBrush" Color="{StaticResource SystemChromeBlackMediumColor}"/>

<SolidColorBrush x:Key="SystemChromeDisabledHighBrush" Color="{StaticResource SystemChromeDisabledHighColor}"/>
<SolidColorBrush x:Key="SystemChromeDisabledLowBrush" Color="{StaticResource SystemChromeDisabledLowColor}"/>

<SolidColorBrush x:Key="SystemChromeHighBrush" Color="{StaticResource SystemChromeHighColor}"/>
<SolidColorBrush x:Key="SystemChromeLowBrush" Color="{StaticResource SystemChromeLowColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumBrush" Color="{StaticResource SystemChromeMediumColor}"/>
<SolidColorBrush x:Key="SystemChromeMediumLowBrush" Color="{StaticResource SystemChromeMediumLowColor}"/>
<SolidColorBrush x:Key="SystemChromeWhiteBrush" Color="{StaticResource SystemChromeWhiteColor}"/>
<SolidColorBrush x:Key="SystemChromeGrayBrush" Color="{StaticResource SystemChromeGrayColor}"/>

<SolidColorBrush x:Key="SystemListLowBrush" Color="{StaticResource SystemListLowColor}"/>
<SolidColorBrush x:Key="SystemListMediumBrush" Color="{StaticResource SystemListMediumColor}"/>

</ResourceDictionary>
2 WamWooWam.Wpf/Themes/Lists.xaml
View file
@@ -46,7 +46,7 @@
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
1 WamWooWam.Wpf/Themes/Menus.xaml.cs
View file
@@ -7,6 +7,7 @@
using System.Windows.Controls;
using System.Windows.Interop;
using System.Windows.Media;
using WamWooWam.Wpf.Interop;

namespace WamWooWam.Wpf.Theme
{
1 WamWooWam.Wpf/Themes/Misc.xaml.cs
View file
@@ -8,6 +8,7 @@
using System.Windows.Controls.Primitives;
using System.Windows.Interop;
using System.Windows.Media;
using WamWooWam.Wpf.Interop;

namespace WamWooWam.Wpf.Theme
{
2 WamWooWam.Wpf/Themes/ScrollBars.xaml
View file
@@ -38,7 +38,7 @@
</ControlTemplate>

<Style x:Key="ScrollBarButton" TargetType="{x:Type RepeatButton}">
<Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
877 WamWooWam.Wpf/TrayIcon.cs
View file

Large diffs are not rendered by default.

5 WamWooWam.Wpf/WamWooWam.Wpf.csproj
View file
@@ -70,6 +70,7 @@
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
@@ -88,6 +89,7 @@
<Compile Include="Converters\DarkenConverter.cs" />
<Compile Include="Converters\LightenConverter.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="Interop.cs" />
<Compile Include="Placeholders.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
@@ -115,6 +117,9 @@
</Compile>
<Compile Include="Tools\AccentColorSet.cs" />
<Compile Include="Tools\ColorTools.cs" />
<Compile Include="TrayIcon.cs">
<SubType>Component</SubType>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>