mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Swapped mahapps window color to analogous 1
This commit is contained in:
parent
a38a5b1503
commit
30c1148e9a
@ -28,23 +28,5 @@ namespace Wabbajack
|
||||
ExtensionManager.Associate(appPath);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
// add custom accent and theme resource dictionaries to the ThemeManager
|
||||
// you should replace MahAppsMetroThemesSample with your application name
|
||||
// and correct place where your custom accent lives
|
||||
ThemeManager.AddAccent("MahappsOverride", new Uri("pack://application:,,,/Wabbajack;component/Themes/MahappStyleOverride.xaml"));
|
||||
|
||||
// get the current app style (theme and accent) from the application
|
||||
Tuple<AppTheme, Accent> theme = ThemeManager.DetectAppStyle(Application.Current);
|
||||
|
||||
//// now change app style to the custom accent and current theme
|
||||
//ThemeManager.ChangeAppStyle(Application.Current,
|
||||
// ThemeManager.GetAccent("MahappsOverride"),
|
||||
// ThemeManager.AppThemes.First(x => x.Name.Equals("BaseDark")));
|
||||
|
||||
base.OnStartup(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,118 +0,0 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
|
||||
mc:Ignorable="options">
|
||||
|
||||
<Color x:Key="HighlightColor">#3700B3</Color>
|
||||
|
||||
<Color x:Key="AccentBaseColor">#FF3700B3</Color>
|
||||
<!-- 80% -->
|
||||
<Color x:Key="AccentColor">#CC3700B3</Color>
|
||||
<!-- 60% -->
|
||||
<Color x:Key="AccentColor2">#993700B3</Color>
|
||||
<!-- 40% -->
|
||||
<Color x:Key="AccentColor3">#663700B3</Color>
|
||||
<!-- 20% -->
|
||||
<Color x:Key="AccentColor4">#333700B3</Color>
|
||||
|
||||
<!-- re-set brushes too -->
|
||||
<SolidColorBrush
|
||||
x:Key="HighlightBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource HighlightColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentBaseColorBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentBaseColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentColorBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentColorBrush2"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor2}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentColorBrush3"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor3}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentColorBrush4"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor4}" />
|
||||
|
||||
<SolidColorBrush
|
||||
x:Key="WindowTitleColorBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
|
||||
<LinearGradientBrush x:Key="ProgressBrush" options:Freeze="True" StartPoint="1.002,0.5" EndPoint="0.001,0.5">
|
||||
<GradientStop Offset="0" Color="{StaticResource HighlightColor}" />
|
||||
<GradientStop Offset="1" Color="{StaticResource AccentColor3}" />
|
||||
</LinearGradientBrush>
|
||||
|
||||
<SolidColorBrush
|
||||
x:Key="CheckmarkFill"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="RightArrowFill"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
|
||||
<Color x:Key="IdealForegroundColor">White</Color>
|
||||
<SolidColorBrush
|
||||
x:Key="IdealForegroundColorBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="IdealForegroundDisabledBrush"
|
||||
options:Freeze="True"
|
||||
Opacity="0.4"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="AccentSelectedColorBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
|
||||
<!-- DataGrid brushes -->
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.HighlightBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.HighlightTextBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.MouseOverHighlightBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor3}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.FocusBorderBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.InactiveSelectionHighlightBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor2}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
|
||||
<SolidColorBrush
|
||||
x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource AccentColor2}" />
|
||||
<SolidColorBrush
|
||||
x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10"
|
||||
options:Freeze="True"
|
||||
Color="{StaticResource IdealForegroundColor}" />
|
||||
</ResourceDictionary>
|
@ -1,4 +1,4 @@
|
||||
<ResourceDictionary
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
@ -50,13 +50,13 @@
|
||||
<!-- Mahapps overrides -->
|
||||
<Color x:Key="AccentBaseColor">#FF3700B3</Color>
|
||||
<!-- 80% -->
|
||||
<Color x:Key="AccentColor">#CC3700B3</Color>
|
||||
<Color x:Key="AccentColor">#CC868CFC</Color>
|
||||
<!-- 60% -->
|
||||
<Color x:Key="AccentColor2">#993700B3</Color>
|
||||
<Color x:Key="AccentColor2">#99868CFC</Color>
|
||||
<!-- 40% -->
|
||||
<Color x:Key="AccentColor3">#663700B3</Color>
|
||||
<Color x:Key="AccentColor3">#66868CFC</Color>
|
||||
<!-- 20% -->
|
||||
<Color x:Key="AccentColor4">#333700B3</Color>
|
||||
<Color x:Key="AccentColor4">#33868CFC</Color>
|
||||
<SolidColorBrush
|
||||
x:Key="HighlightBrush"
|
||||
options:Freeze="True"
|
||||
|
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
@ -239,10 +239,6 @@
|
||||
<Compile Include="Views\Compilers\VortexCompilerConfigView.xaml.cs">
|
||||
<DependentUpon>VortexCompilerConfigView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Page Include="Themes\MahappStyleOverride.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Views\LinksView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
|
Loading…
Reference in New Issue
Block a user