From aa1e0ee267319099db5e4c27082284549925046d Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Thu, 23 Nov 2023 16:01:10 -0300 Subject: [PATCH 1/4] Centered Initialization of Forms and Consistent Element Positioning Now, all forms are initialized centered on the screen. WindowStartupLocation="CenterOwner"> Adjustments have been made to ensure consistent element positioning, providing a more organized and user-friendly experience in MainWindow.axaml. --- TexturePlugin/EditDialog.axaml | 3 +- TexturePluginPreview/App.axaml | 3 +- TexturePluginPreview/MainWindow.axaml | 3 +- UABEAvalonia/Forms/About.axaml | 3 +- UABEAvalonia/Forms/AddAssetWindow.axaml | 3 +- UABEAvalonia/Forms/AddDependencyWindow.axaml | 3 +- .../AssetsFileInfo/AssetsFileInfoWindow.axaml | 3 +- UABEAvalonia/Forms/DataWindow.axaml | 3 +- UABEAvalonia/Forms/EditDataWindow.axaml | 3 +- .../Forms/ExportBatchChooseTypeDialog.axaml | 3 +- .../Forms/FilterAssetTypeDialog.axaml | 3 +- UABEAvalonia/Forms/GameObjectViewWindow.axaml | 3 +- UABEAvalonia/Forms/GoToAssetDialog.axaml | 3 +- UABEAvalonia/Forms/ImportBatch.axaml | 3 +- .../Forms/ImportSerializedDialog.axaml | 3 +- UABEAvalonia/Forms/InfoWindow.axaml | 3 +- UABEAvalonia/Forms/LoadModPackageDialog.axaml | 3 +- UABEAvalonia/Forms/MainWindow.axaml | 58 ++++++++++--------- UABEAvalonia/Forms/ModMakerDialog.axaml | 3 +- UABEAvalonia/Forms/PluginWindow.axaml | 3 +- UABEAvalonia/Forms/ProgressWindow.axaml | 3 +- UABEAvalonia/Forms/RenameWindow.axaml | 3 +- UABEAvalonia/Forms/SearchDialog.axaml | 3 +- UABEAvalonia/Forms/SelectDumpWindow.axaml | 3 +- .../Utils/MessageBox/MessageBox.axaml | 3 +- 25 files changed, 80 insertions(+), 50 deletions(-) diff --git a/TexturePlugin/EditDialog.axaml b/TexturePlugin/EditDialog.axaml index 508ff24..26bd156 100644 --- a/TexturePlugin/EditDialog.axaml +++ b/TexturePlugin/EditDialog.axaml @@ -5,7 +5,8 @@ mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="360" Width="300" Height="360" x:Class="TexturePlugin.EditDialog" - Title="Texture Edit"> + Title="Texture Edit" + WindowStartupLocation="CenterOwner"> diff --git a/TexturePluginPreview/App.axaml b/TexturePluginPreview/App.axaml index 77f08ad..357b255 100644 --- a/TexturePluginPreview/App.axaml +++ b/TexturePluginPreview/App.axaml @@ -1,6 +1,7 @@ + x:Class="TexturePluginPreview.App" + WindowStartupLocation="CenterOwner"> diff --git a/TexturePluginPreview/MainWindow.axaml b/TexturePluginPreview/MainWindow.axaml index 91e669e..9309cda 100644 --- a/TexturePluginPreview/MainWindow.axaml +++ b/TexturePluginPreview/MainWindow.axaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="TexturePluginPreview.MainWindow" - Title="TexturePluginPreview"> + Title="TexturePluginPreview" + WindowStartupLocation="CenterOwner"> Welcome to Avalonia! diff --git a/UABEAvalonia/Forms/About.axaml b/UABEAvalonia/Forms/About.axaml index 7b51b5b..5d521e7 100644 --- a/UABEAvalonia/Forms/About.axaml +++ b/UABEAvalonia/Forms/About.axaml @@ -7,7 +7,8 @@ Icon="/Assets/uabeavalonia16.ico" CanResize="False" x:Class="UABEAvalonia.About" - Title="About Unity Assets Bundle Extractor Avalonia"> + Title="About Unity Assets Bundle Extractor Avalonia" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/AddAssetWindow.axaml b/UABEAvalonia/Forms/AddAssetWindow.axaml index 134a760..f8d2f60 100644 --- a/UABEAvalonia/Forms/AddAssetWindow.axaml +++ b/UABEAvalonia/Forms/AddAssetWindow.axaml @@ -6,7 +6,8 @@ Width="300" Height="200" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.AddAssetWindow" - Title="Add asset"> + Title="Add asset" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/AddDependencyWindow.axaml b/UABEAvalonia/Forms/AddDependencyWindow.axaml index 2945567..d559b69 100644 --- a/UABEAvalonia/Forms/AddDependencyWindow.axaml +++ b/UABEAvalonia/Forms/AddDependencyWindow.axaml @@ -6,7 +6,8 @@ Width="350" Height="160" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.AddDependencyWindow" - Title="Add dependency"> + Title="Add dependency" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/AssetsFileInfo/AssetsFileInfoWindow.axaml b/UABEAvalonia/Forms/AssetsFileInfo/AssetsFileInfoWindow.axaml index 3fdbcc4..1b28672 100644 --- a/UABEAvalonia/Forms/AssetsFileInfo/AssetsFileInfoWindow.axaml +++ b/UABEAvalonia/Forms/AssetsFileInfo/AssetsFileInfoWindow.axaml @@ -6,7 +6,8 @@ Width="650" Height="450" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.AssetsFileInfoWindow" - Title="Assets File Header/Metadata Info"> + Title="Assets File Header/Metadata Info" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/DataWindow.axaml b/UABEAvalonia/Forms/DataWindow.axaml index 797b779..6237b4c 100644 --- a/UABEAvalonia/Forms/DataWindow.axaml +++ b/UABEAvalonia/Forms/DataWindow.axaml @@ -7,6 +7,7 @@ Width="350" Height="550" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.DataWindow" - Title="View Data"> + Title="View Data" + WindowStartupLocation="CenterOwner"> \ No newline at end of file diff --git a/UABEAvalonia/Forms/EditDataWindow.axaml b/UABEAvalonia/Forms/EditDataWindow.axaml index 514d061..a60839e 100644 --- a/UABEAvalonia/Forms/EditDataWindow.axaml +++ b/UABEAvalonia/Forms/EditDataWindow.axaml @@ -8,7 +8,8 @@ Width="350" Height="550" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.EditDataWindow" - Title="Edit Data"> + Title="Edit Data" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/ExportBatchChooseTypeDialog.axaml b/UABEAvalonia/Forms/ExportBatchChooseTypeDialog.axaml index 3ba8a92..bdc7fc5 100644 --- a/UABEAvalonia/Forms/ExportBatchChooseTypeDialog.axaml +++ b/UABEAvalonia/Forms/ExportBatchChooseTypeDialog.axaml @@ -7,7 +7,8 @@ Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.ExportBatchChooseTypeDialog" Title="Batch Export" - CanResize="False"> + CanResize="False" + WindowStartupLocation="CenterOwner"> PNG diff --git a/UABEAvalonia/Forms/FilterAssetTypeDialog.axaml b/UABEAvalonia/Forms/FilterAssetTypeDialog.axaml index af853ae..f841116 100644 --- a/UABEAvalonia/Forms/FilterAssetTypeDialog.axaml +++ b/UABEAvalonia/Forms/FilterAssetTypeDialog.axaml @@ -5,7 +5,8 @@ mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="500" Width="300" Height="500" x:Class="UABEAvalonia.FilterAssetTypeDialog" - Title="Type Filter"> + Title="Type Filter" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/GameObjectViewWindow.axaml b/UABEAvalonia/Forms/GameObjectViewWindow.axaml index cb2b639..1da3bc1 100644 --- a/UABEAvalonia/Forms/GameObjectViewWindow.axaml +++ b/UABEAvalonia/Forms/GameObjectViewWindow.axaml @@ -7,7 +7,8 @@ Width="700" Height="450" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.GameObjectViewWindow" - Title="GameObject Viewer"> + Title="GameObject Viewer" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/GoToAssetDialog.axaml b/UABEAvalonia/Forms/GoToAssetDialog.axaml index 0630b9f..6b0148e 100644 --- a/UABEAvalonia/Forms/GoToAssetDialog.axaml +++ b/UABEAvalonia/Forms/GoToAssetDialog.axaml @@ -6,7 +6,8 @@ Width="300" Height="110" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.GoToAssetDialog" - Title="Go to asset"> + Title="Go to asset" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/ImportBatch.axaml b/UABEAvalonia/Forms/ImportBatch.axaml index 42ac5cc..4e625e4 100644 --- a/UABEAvalonia/Forms/ImportBatch.axaml +++ b/UABEAvalonia/Forms/ImportBatch.axaml @@ -6,7 +6,8 @@ Width="700" Height="350" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.ImportBatch" - Title="Batch import"> + Title="Batch import" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/ImportSerializedDialog.axaml b/UABEAvalonia/Forms/ImportSerializedDialog.axaml index 596330e..d121653 100644 --- a/UABEAvalonia/Forms/ImportSerializedDialog.axaml +++ b/UABEAvalonia/Forms/ImportSerializedDialog.axaml @@ -7,7 +7,8 @@ Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.ImportSerializedDialog" Title="Import" - CanResize="False"> + CanResize="False" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/InfoWindow.axaml b/UABEAvalonia/Forms/InfoWindow.axaml index 22cf3ae..11cbba4 100644 --- a/UABEAvalonia/Forms/InfoWindow.axaml +++ b/UABEAvalonia/Forms/InfoWindow.axaml @@ -7,7 +7,8 @@ Width="800" Height="500" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.InfoWindow" - Title="Assets Info"> + Title="Assets Info" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/LoadModPackageDialog.axaml b/UABEAvalonia/Forms/LoadModPackageDialog.axaml index 61d0290..8616a8f 100644 --- a/UABEAvalonia/Forms/LoadModPackageDialog.axaml +++ b/UABEAvalonia/Forms/LoadModPackageDialog.axaml @@ -7,7 +7,8 @@ Width="300" Height="400" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.LoadModPackageDialog" - Title="Load Package"> + Title="Load Package" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/MainWindow.axaml b/UABEAvalonia/Forms/MainWindow.axaml index 1791801..41c8b06 100644 --- a/UABEAvalonia/Forms/MainWindow.axaml +++ b/UABEAvalonia/Forms/MainWindow.axaml @@ -4,10 +4,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="150" Width="400" Height="150" + MinWidth="400" MinHeight="150" + MaxWidth="400" MaxHeight="150" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.MainWindow" Title="UABEA" - DragDrop.AllowDrop="True"> + DragDrop.AllowDrop="True" + WindowStartupLocation="CenterOwner"> @@ -21,8 +24,8 @@ - - + + @@ -30,7 +33,7 @@ - + @@ -43,28 +46,31 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UABEAvalonia/Forms/ModMakerDialog.axaml b/UABEAvalonia/Forms/ModMakerDialog.axaml index 0ae67a6..3d3de09 100644 --- a/UABEAvalonia/Forms/ModMakerDialog.axaml +++ b/UABEAvalonia/Forms/ModMakerDialog.axaml @@ -7,7 +7,8 @@ Width="500" Height="250" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.ModMakerDialog" - Title="Mod Maker Package Creator"> + Title="Mod Maker Package Creator" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/PluginWindow.axaml b/UABEAvalonia/Forms/PluginWindow.axaml index 55b2de2..21f5396 100644 --- a/UABEAvalonia/Forms/PluginWindow.axaml +++ b/UABEAvalonia/Forms/PluginWindow.axaml @@ -6,7 +6,8 @@ Width="300" Height="450" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.PluginWindow" - Title="Plugins"> + Title="Plugins" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/ProgressWindow.axaml b/UABEAvalonia/Forms/ProgressWindow.axaml index 84ca7e7..997936d 100644 --- a/UABEAvalonia/Forms/ProgressWindow.axaml +++ b/UABEAvalonia/Forms/ProgressWindow.axaml @@ -5,7 +5,8 @@ mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="100" Width="400" Height="100" x:Class="UABEAvalonia.ProgressWindow" - Title=""> + Title="" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/RenameWindow.axaml b/UABEAvalonia/Forms/RenameWindow.axaml index 800acbd..eb95f0a 100644 --- a/UABEAvalonia/Forms/RenameWindow.axaml +++ b/UABEAvalonia/Forms/RenameWindow.axaml @@ -5,7 +5,8 @@ mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="120" Width="300" Height="120" x:Class="UABEAvalonia.RenameWindow" - Title="RenameWindow"> + Title="RenameWindow" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/SearchDialog.axaml b/UABEAvalonia/Forms/SearchDialog.axaml index 4c324bb..ebafb78 100644 --- a/UABEAvalonia/Forms/SearchDialog.axaml +++ b/UABEAvalonia/Forms/SearchDialog.axaml @@ -6,7 +6,8 @@ Width="300" Height="120" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.SearchDialog" - Title="Search"> + Title="Search" + WindowStartupLocation="CenterOwner"> diff --git a/UABEAvalonia/Forms/SelectDumpWindow.axaml b/UABEAvalonia/Forms/SelectDumpWindow.axaml index 153f7e3..5b3f387 100644 --- a/UABEAvalonia/Forms/SelectDumpWindow.axaml +++ b/UABEAvalonia/Forms/SelectDumpWindow.axaml @@ -6,7 +6,8 @@ Width="300" Height="80" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.SelectDumpWindow" - Title="Select dump type"> + Title="Select dump type" + WindowStartupLocation="CenterOwner"> UABE text dump diff --git a/UABEAvalonia/Utils/MessageBox/MessageBox.axaml b/UABEAvalonia/Utils/MessageBox/MessageBox.axaml index 73c2de2..fad3845 100644 --- a/UABEAvalonia/Utils/MessageBox/MessageBox.axaml +++ b/UABEAvalonia/Utils/MessageBox/MessageBox.axaml @@ -5,7 +5,8 @@ mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="150" Width="300" Height="150" x:Class="UABEAvalonia.MessageBox" - Title="Message Box"> + Title="Message Box" + WindowStartupLocation="CenterOwner"> From a030a3eda39edeb0530484738d6b8f6f76f53d38 Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Thu, 23 Nov 2023 16:43:39 -0300 Subject: [PATCH 2/4] Update App.axaml --- TexturePluginPreview/App.axaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TexturePluginPreview/App.axaml b/TexturePluginPreview/App.axaml index 357b255..77f08ad 100644 --- a/TexturePluginPreview/App.axaml +++ b/TexturePluginPreview/App.axaml @@ -1,7 +1,6 @@ + x:Class="TexturePluginPreview.App"> From ba2642074d2f02578327596c90d4e069c5a2c75f Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Thu, 23 Nov 2023 18:50:03 -0300 Subject: [PATCH 3/4] Update InfoWindow.axaml --- UABEAvalonia/Forms/InfoWindow.axaml | 84 +++++++++++++++-------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/UABEAvalonia/Forms/InfoWindow.axaml b/UABEAvalonia/Forms/InfoWindow.axaml index 11cbba4..a76bac3 100644 --- a/UABEAvalonia/Forms/InfoWindow.axaml +++ b/UABEAvalonia/Forms/InfoWindow.axaml @@ -3,14 +3,14 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:UABEAvalonia" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500" - Width="800" Height="500" + mc:Ignorable="d" d:DesignWidth="1100" d:DesignHeight="500" + Width="1100" Height="500" Icon="/Assets/uabeavalonia16.ico" x:Class="UABEAvalonia.InfoWindow" Title="Assets Info" WindowStartupLocation="CenterOwner"> - + @@ -39,33 +39,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +