Adjust splashscreen layout and hide close button.

2 files changed, 18 insertions, 3 deletions

diff --git a/MediaBrowser.Common/UI/Splash.xaml b/MediaBrowser.Common/UI/Splash.xaml
index 3927017f9..85fc9d684 100644
--- a/MediaBrowser.Common/UI/Splash.xaml
+++ b/MediaBrowser.Common/UI/Splash.xaml
@@ -1,11 +1,11 @@
 <Window x:Class="MediaBrowser.Common.UI.Splash"

         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-        Title="SplashScreen" Height="346" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"

-        WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black">

+        Title="MediaBrowser" Height="346" Width="600" ShowInTaskbar="False" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"

+        WindowState="Normal" WindowStyle="SingleBorderWindow" Background="Black" Loaded="Splash_Loaded">

     <Grid Name="splashGrid">

         <Image HorizontalAlignment="Left" Height="213" Margin="10,10,0,0" VerticalAlignment="Top" Width="574" Source="/MediaBrowser.Common;component/Resources/mblogo1000.png" Stretch="Fill"/>

         <ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="10,242,0,0" VerticalAlignment="Top" Width="574"/>

-        <Label Name="lblProgress" Content="Label" HorizontalAlignment="Left" Margin="10,282,0,0" VerticalAlignment="Top" Width="574" Foreground="White"/>

+        <Label Name="lblProgress" Content="Label" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Margin="10,282,10,0" VerticalAlignment="Top" Width="574" Foreground="White"/>

     </Grid>

 </Window>

diff --git a/MediaBrowser.Common/UI/Splash.xaml.cs b/MediaBrowser.Common/UI/Splash.xaml.cs
index 6d1d313e8..c8653646c 100644
--- a/MediaBrowser.Common/UI/Splash.xaml.cs
+++ b/MediaBrowser.Common/UI/Splash.xaml.cs
@@ -8,8 +8,10 @@ using System.Windows.Controls;
 using System.Windows.Data;

 using System.Windows.Documents;

 using System.Windows.Input;

+using System.Runtime.InteropServices;

 using System.Windows.Media;

 using System.Windows.Media.Imaging;

+using System.Windows.Interop;

 using System.Windows.Shapes;

 

 using MediaBrowser.Model.Progress;

@@ -21,6 +23,13 @@ namespace MediaBrowser.Common.UI
     /// </summary>

     public partial class Splash : Window

     {

+        private const int GWL_STYLE = -16;

+        private const int WS_SYSMENU = 0x80000;

+        [DllImport("user32.dll", SetLastError = true)]

+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);

+        [DllImport("user32.dll")]

+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);

+

 

         public Splash(Progress<TaskProgress> progress)

         {

@@ -34,5 +43,11 @@ namespace MediaBrowser.Common.UI
             this.lblProgress.Content = e.Description;

             this.pbProgress.Value = (double)e.PercentComplete;

         }

+

+        private void Splash_Loaded(object sender, RoutedEventArgs e)

+        {

+            var hwnd = new WindowInteropHelper(this).Handle;

+            SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU);

+        }

     }

 }