Quality Fixes + Bug fixes Batch A

UI : Chat messages followed by Chat Status messages doesn't add buffers
SyncPlay : Handle thread upon exit + exception
SyncPlay : Share VLC file name with wrapper

Author: arkangel-dev

SyncPlayWPF/.vs/SyncPlayWPF/v16/.suo

@@ -45,7 +45,7 @@
         </Grid.RowDefinitions>
 
         <!-- Title bar -->
-        <Grid Grid.Row="0" UIElement.MouseDown="WindowDrag" Background="{StaticResource DarkMode_AccentColorA}">
+        <Grid Grid.Row="0" x:Name="TitleBar" UIElement.MouseDown="WindowDrag" Background="{StaticResource DarkMode_AccentColorA}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="35"/>
@@ -61,16 +61,22 @@
                 FontWeight="DemiBold">SyncPlay.NET</Label>
             <custom:ImageButton 
                 Grid.Column="1" 
+                x:Name="WindowMinimiseButton"
+                Click="WindowMinimiseButton_Click"
                 Image="{StaticResource MinimizeButton}"
                 Style="{StaticResource TitleBarButtons}"/>
             <custom:ImageButton 
                 Grid.Column="2" 
+                x:Name="WindowRestoreButton"
+                Click="WindowRestoreButton_Click"
                 Image="{StaticResource RestoreWindowButton}"
                 Style="{StaticResource TitleBarButtons}"/>
             <custom:ImageButton
                 Grid.Column="3" 
+                Click="WindowCloseButton_Click"
                 ImageBackgroundClickBrush="#FFABAB"
                 BackgroundClickBrush="#FC4B4B"
+                x:Name="WindowCloseButton"
                 Image="{StaticResource CloseWindowButton}"
                 Style="{StaticResource TitleBarButtons}"/>
         </Grid>

SyncPlayWPF/SyncPlayWPF/ImageLib/SyncplayOriginal_Logo.ico

@@ -28,6 +28,8 @@ public MainWindow() {
             RootPageTransition.ShowPage(new Pages.NewSessionPage());
 
             Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
+
+            InitHeader();
         }
 
         private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) {
@@ -38,8 +40,93 @@ private void Current_DispatcherUnhandledException(object sender, System.Windows.
 
         private void WindowDrag(object sender, MouseButtonEventArgs e) {
             if (System.Windows.Input.Mouse.LeftButton == MouseButtonState.Pressed) {
+
+                //if (WindowState == WindowState.Maximized) {
+                //    var point = PointToScreen(e.MouseDevice.GetPosition(this));
+
+                //    if (point.X <= RestoreBounds.Width / 2)
+                //        Left = 0;
+
+                //    else if (point.X >= RestoreBounds.Width)
+                //        Left = point.X - (RestoreBounds.Width - (this.ActualWidth - point.X));
+
+                //    else
+                //        Left = point.X - (RestoreBounds.Width / 2);
+
+                //    Top = point.Y - (((FrameworkElement)sender).ActualHeight / 2);
+                //    WindowState = WindowState.Normal;
+                //}
+
                 App.Current.MainWindow.DragMove();
             }
         }
+
+        private void WindowMinimiseButton_Click(object sender, RoutedEventArgs e) {
+            this.WindowState = WindowState.Minimized;
+        }
+
+        private void WindowRestoreButton_Click(object sender, RoutedEventArgs e) {
+            if (this.WindowState == WindowState.Maximized)
+                this.WindowState = WindowState.Normal;
+            else
+                this.WindowState = WindowState.Maximized;
+        }
+
+        private void WindowCloseButton_Click(object sender, RoutedEventArgs e) {
+            System.Windows.Application.Current.Shutdown();
+        }
+
+
+        private void InitHeader() {
+            var border = TitleBar;
+            var restoreIfMove = false;
+
+            border.MouseLeftButtonDown += (s, e) => {
+                if (e.ClickCount == 2) {
+                    if ((ResizeMode == ResizeMode.CanResize) ||
+                        (ResizeMode == ResizeMode.CanResizeWithGrip)) {
+                        SwitchState();
+                    }
+                } else {
+                    if (WindowState == WindowState.Maximized) {
+                        restoreIfMove = true;
+                    }
+                    DragMove();
+                }
+            };
+            border.MouseLeftButtonUp += (s, e) => { restoreIfMove = false; };
+            border.MouseMove += (s, e) => {
+                if (restoreIfMove) {
+                    restoreIfMove = false;
+                    var mouseX = e.GetPosition(this).X;
+                    var width = RestoreBounds.Width;
+                    var x = mouseX - width / 2;
+
+                    if (x < 0) {
+                        x = 0;
+                    } else if (x + width > System.Windows.SystemParameters.PrimaryScreenWidth) {
+                        x = System.Windows.SystemParameters.PrimaryScreenWidth - width;
+                    }
+
+                    WindowState = WindowState.Normal;
+                    Left = x;
+                    Top = 0;
+                    DragMove();
+                }
+            };
+        }
+
+        private void SwitchState() {
+            switch (WindowState) {
+                case WindowState.Normal: {
+                        WindowState = WindowState.Maximized;
+                        break;
+                    }
+                case WindowState.Maximized: {
+                        WindowState = WindowState.Normal;
+                        break;
+                    }
+            }
+        }
     }
 }

SyncPlayWPF/SyncPlayWPF/ImageLib/SyncplayOriginal_Logo.png

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -23,6 +24,22 @@ public SessionLandingPage() {
 
             Common.Shared.ChatPageSingleton = new Pages.SessionPages.ChatSession();
             ShowChatWindow();
+            this.Loaded += PageLoaded;
+        }
+
+        private void PageLoaded(object sender, RoutedEventArgs e) {
+          
+            Common.Shared.Wrapper.Player.OnPlayerClosed += delegate {
+                ThreadStart ts = delegate () {
+                    Dispatcher.BeginInvoke((Action)delegate () {
+                        Application.Current.Shutdown();
+                    });
+                };
+                Thread t = new Thread(ts);
+                t.Start();
+            };
+            
+            
         }
 
         private void ShowChatWindow() {

SyncPlayWPF/SyncPlayWPF/ImageLib/SyncplayOriginal_Logo_Icon.png

@@ -14,9 +14,7 @@
 using System.Windows.Shapes;
 
 namespace SyncPlayWPF.Pages.SessionPages {
-    /// <summary>
-    /// Interaction logic for ChatSession.xaml
-    /// </summary>
+
     public partial class ChatSession : UserControl {
         public ChatSession() {
             InitializeComponent();
@@ -36,13 +34,14 @@ private void NewChatEvent(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.Cha
                 if (!LastAdditionWasChatInfo) {
                     var spacer = new Border();
                     spacer.Style = (Style)this.FindResource("ChatInfoSpacer");
-                    LastAdditionWasChatInfo = true;
                     MessageStack.Children.Add(spacer);
                 }
                 var msgblock = new TextBlock();
                 msgblock.Text = e.Message;
                 msgblock.Style = (Style)this.FindResource("ChatInfo");
                 MessageStack.Children.Add(msgblock);
+                LastAdditionWasChatInfo = true;
+                this.LastSender = null;
             });
         }
 
@@ -51,6 +50,7 @@ private void NewChatMessage(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.C
                 if (LastAdditionWasChatInfo) {
                     var spacer = new Border();
                     spacer.Style = (Style)this.FindResource("ChatInfoSpacer");
+                    MessageStack.Children.Add(spacer);
                     LastAdditionWasChatInfo = false;
                 }
                 var msgballoon = new CustomControls.ChatMessage();
@@ -59,12 +59,9 @@ private void NewChatMessage(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.C
                 msgballoon.MessageContent = e.Message;
                 msgballoon.IsInitialMessage = LastSender == null || LastSender != e.Sender;
                 msgballoon.MessageTime = DateTime.Now.ToString("hh:mm tt");
-
                 LastSender = e.Sender;
-
                 var text = new TextBlock();
                 text.Text = e.Message;
-
                 MessageStack.Children.Add(msgballoon);
             });
         }
@@ -76,8 +73,6 @@ private void SendMessageButtonClick(object sender, RoutedEventArgs e) {
         private void SendMessage() {
             if (!String.IsNullOrWhiteSpace(MessageBlockField.Text)) {
                 Common.Shared.Wrapper.SyncPlayClient.SendChatMessage(MessageBlockField.Text);
-            } else {
-                Console.WriteLine("Ignored Blank Message");
             }
             MessageBlockField.Text = "";
         }

SyncPlayWPF/SyncPlayWPF/MainWindow.xaml

@@ -7,12 +7,12 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SyncPlayWPF")]
+[assembly: AssemblyTitle("SyncPlay.NET")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SyncPlayWPF")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Arkangel © 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2021.202.19.0")]
-[assembly: AssemblyFileVersion("2021.202.19.0")]
+[assembly: AssemblyVersion("2021.203.9.0")]
+[assembly: AssemblyFileVersion("2021.203.9.0")]

SyncPlayWPF/SyncPlayWPF/MainWindow.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyncPlay.EventArgs {
+    public class NewFileLoadEventArgs {
+        public string FileName;
+        public string AbsoluteFilePath;
+
+        public NewFileLoadEventArgs(string fname, string afilepath) {
+            this.FileName = fname;
+            this.AbsoluteFilePath = afilepath;
+        }
+    }
+}