Min Windows size reduced and close/min/max button fixed

BornToBeRoot · BornToBeRoot · commit e92de610f627 · 2022-01-11T23:30:21.000+01:00
diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
@@ -1,21 +1,21 @@
-﻿<mahAppsControls:MetroWindow x:Class="NETworkManager.Controls.DragablzTabHostWindow"
+﻿<mah:MetroWindow x:Class="NETworkManager.Controls.DragablzTabHostWindow"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
         xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
         xmlns:controls="clr-namespace:NETworkManager.Controls"
         xmlns:application="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
         mc:Ignorable="d"
-        Style="{DynamicResource DefaultWindow}" MinWidth="1024" Width="1024" Height="768" MinHeight="576" TitleAlignment="Left"
+        Style="{DynamicResource DefaultWindow}" MinWidth="800" Width="1024" Height="768" MinHeight="600" TitleAlignment="Left"
         d:DataContext="{d:DesignInstance controls:DragablzTabHostWindow}">
-    <mahAppsControls:MetroWindow.WindowButtonCommands>
-        <mahAppsControls:WindowButtonCommands Template="{DynamicResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
-    </mahAppsControls:MetroWindow.WindowButtonCommands>
+    <mah:MetroWindow.WindowButtonCommands>
+        <mah:WindowButtonCommands Template="{DynamicResource MahApps.Templates.WindowButtonCommands.Win10}" />
+    </mah:MetroWindow.WindowButtonCommands>
     <Grid>
         <dragablz:TabablzControl Focusable="False" Name="TabsContainer" ClosingItemCallback="{Binding CloseItemCommand}">
             <dragablz:TabablzControl.Resources>
@@ -316,7 +316,7 @@
                                                                         </Rectangle.OpacityMask>
                                                                     </Rectangle>
                                                                 </MenuItem.Icon>
-                                                            </MenuItem>                                                           
+                                                            </MenuItem>
                                                         </ContextMenu>
                                                     </Grid.ContextMenu>
                                                     <Grid.InputBindings>
@@ -439,4 +439,4 @@
             </dragablz:TabablzControl.Style>
         </dragablz:TabablzControl>
     </Grid>
-</mahAppsControls:MetroWindow>
+</mah:MetroWindow>
diff --git a/Source/NETworkManager/MainWindow.xaml b/Source/NETworkManager/MainWindow.xaml
@@ -12,7 +12,7 @@
         xmlns:resources="clr-namespace:NETworkManager.Properties"
         xmlns:networkManager="clr-namespace:NETworkManager"
         mc:Ignorable="d"
-        Style="{DynamicResource DefaultWindow}" MinWidth="1024" Width="1024" Height="768" MinHeight="576" SaveWindowPosition="True" TitleAlignment="Left" Closing="MetroWindowMain_Closing" StateChanged="MetroWindowMain_StateChanged"
+        Style="{DynamicResource DefaultWindow}" MinWidth="800" Width="1024" Height="768" MinHeight="600" SaveWindowPosition="True" TitleAlignment="Left" Closing="MetroWindowMain_Closing" StateChanged="MetroWindowMain_StateChanged"
         d:DataContext="{d:DesignInstance networkManager:MainWindow}">
     <!-- MetroDialogStyles.xaml must be adjusted if MinWidth/MinHeight is changed -->
     <Window.Resources>
