Fixed an issue when window is maximized (#106)

Leo-Corporation · Aug 8, 2023 · 078da9b · 078da9b
1 parent 70dad3c
commit 078da9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Datalya/MainWindow.xaml.cs b/Datalya/MainWindow.xaml.cs
@@ -122,7 +122,8 @@ private void RefreshState()
 		MaximizeToolTip.Content = WindowState == WindowState.Maximized ? Properties.Resources.Restore : Properties.Resources.Maximize; // Set
 		DefineMaximumSize(); // Avoid taskbar overflow
 
-		WindowBorder.Margin = WindowState == WindowState.Maximized ? new(10, 10, 0, 0) : new(10); // Set
+		WindowBorder.CornerRadius = WindowState == WindowState.Maximized ? new(0) : new(5);
+		WindowBorder.Margin = WindowState == WindowState.Maximized ? new(5, 5, 0, 0) : new(10); // Set
 	}
 
 	private void TabEnter(object sender, MouseEventArgs e)
@@ -216,8 +217,8 @@ private void DefineMaximumSize()
 
 		double factor = scaling / 100d; // Calculate factor
 
-		MaxHeight = currentScreen.WorkingArea.Height / factor + 5; // Set max size
-		MaxWidth = currentScreen.WorkingArea.Width / factor + 5; // Set max size
+		MaxHeight = currentScreen.WorkingArea.Height / factor + 7; // Set max size
+		MaxWidth = currentScreen.WorkingArea.Width / factor + 7; // Set max size
 	}
 
 	internal void SettingsBtn_Click(object sender, RoutedEventArgs e)

diff --git a/Datalya/Windows/HomeWindow.xaml.cs b/Datalya/Windows/HomeWindow.xaml.cs
@@ -204,8 +204,8 @@ private void DefineMaximumSize()
 
 		double factor = scaling / 100d; // Calculate factor
 
-		MaxHeight = currentScreen.WorkingArea.Height / factor + 5; // Set max size
-		MaxWidth = currentScreen.WorkingArea.Width / factor + 5; // Set max size
+		MaxHeight = currentScreen.WorkingArea.Height / factor + 7; // Set max size
+		MaxWidth = currentScreen.WorkingArea.Width / factor + 7; // Set max size
 	}
 
 	private void RefreshState()
@@ -214,7 +214,8 @@ private void RefreshState()
 		MaximizeToolTip.Content = WindowState == WindowState.Maximized ? Properties.Resources.Restore : Properties.Resources.Maximize; // Set
 		DefineMaximumSize(); // Avoid taskbar overflow
 
-		WindowBorder.Margin = WindowState == WindowState.Maximized ? new(10, 10, 0, 0) : new(10); // Set
+		WindowBorder.CornerRadius = WindowState == WindowState.Maximized ? new(0) : new(5);
+		WindowBorder.Margin = WindowState == WindowState.Maximized ? new(5, 5, 0, 0) : new(10); // Set
 	}
 
 	private void MinimizeBtn_Click(object sender, RoutedEventArgs e)