DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-31 01:42:02 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
SpoinkyNL 2019-12-13 20:09:31 +01:00
commit 7e324f1b00
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Artemis.UI/Screens/Splash/SplashView.xaml
View File

@ -5,13 +5,16 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:splash="clr-namespace:Artemis.UI.Screens.Splash" xmlns:splash="clr-namespace:Artemis.UI.Screens.Splash"
xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions" xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d" mc:Ignorable="d"
Title="Artemis" Title=" "
WindowStyle="None" ResizeMode="NoResize"
BorderBackgroundBrush="{DynamicResource PrimaryHueMidBrush}"
Height="450" Height="450"
Width="400" Width="400"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto" FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
MouseDown="{s:Action MouseDown}"
d:DataContext="{d:DesignInstance splash:SplashViewModel}"> d:DataContext="{d:DesignInstance splash:SplashViewModel}">
<Grid Background="{DynamicResource PrimaryHueMidBrush}"> <Grid Background="{DynamicResource PrimaryHueMidBrush}">
<Grid.RowDefinitions> <Grid.RowDefinitions>

12
src/Artemis.UI/Screens/Splash/SplashViewModel.cs
View File

@ -1,4 +1,6 @@
using Artemis.Core.Services.Interfaces; using System.Windows.Input;
using Artemis.Core.Services.Interfaces;
using MaterialDesignExtensions.Controls;
using Ninject; using Ninject;
using Stylet; using Stylet;
@ -23,5 +25,13 @@ namespace Artemis.UI.Screens.Splash
pluginService.PluginLoading += (sender, args) => Status = "Loading plugin: " + args.PluginInfo.Name; pluginService.PluginLoading += (sender, args) => Status = "Loading plugin: " + args.PluginInfo.Name;
pluginService.PluginLoaded += (sender, args) => Status = "Initializing UI"; pluginService.PluginLoaded += (sender, args) => Status = "Initializing UI";
} }
// ReSharper disable once UnusedMember.Global - Called from view
public void MouseDown(object sender, MouseButtonEventArgs e)
{
// Allow dragging the window by clicking anywhere
if (e.ChangedButton == MouseButton.Left)
((MaterialWindow) View).DragMove();
}
} }
} }