Window swapped to Mahapps window

This commit is contained in:
Justin Swanson 2019-11-24 23:43:56 -06:00
parent edcf75c28c
commit 5f67725ed4
3 changed files with 8 additions and 5 deletions

View File

@ -10,6 +10,7 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Steel.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
<ResourceDictionary Source="Themes\Styles.xaml" />
</ResourceDictionary.MergedDictionaries>

View File

@ -1,9 +1,10 @@
<Window
<mahapps:MetroWindow
x:Class="Wabbajack.MainWindow"
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"
xmlns:local="clr-namespace:Wabbajack"
xmlns:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="Wabbajack"
Width="1280"
@ -11,10 +12,10 @@
MinWidth="850"
MinHeight="650"
Closing="Window_Closing"
Icon="../Resources/Icons/wabbajack.ico"
RenderOptions.BitmapScalingMode="HighQuality"
ResizeMode="CanResize"
Style="{StaticResource {x:Type Window}}"
TitlebarHeight="25"
UseLayoutRounding="True"
WindowStyle="ToolWindow"
mc:Ignorable="d">
@ -31,4 +32,4 @@
</DataTemplate>
</ContentPresenter.Resources>
</ContentPresenter>
</Window>
</mahapps:MetroWindow>

View File

@ -1,6 +1,7 @@
using System;
using System.ComponentModel;
using System.Windows;
using MahApps.Metro.Controls;
using Wabbajack.Common;
using Application = System.Windows.Application;
@ -9,7 +10,7 @@ namespace Wabbajack
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
public partial class MainWindow : MetroWindow
{
private MainWindowVM _mwvm;
private MainSettings _settings;
@ -19,7 +20,7 @@ namespace Wabbajack
_settings = MainSettings.LoadSettings();
_mwvm = new MainWindowVM(this, _settings);
DataContext = _mwvm;
Utils.Log($"Wabbajack Build - {ThisAssembly.Git.Sha}");
Wabbajack.Common.Utils.Log($"Wabbajack Build - {ThisAssembly.Git.Sha}");
}
internal bool ExitWhenClosing = true;