[Refactor] Move row and column Grid definitions to attributes

This commit is contained in:
2025-07-08 17:55:44 +01:00
parent 86420a4fd0
commit 563ffcdd32
10 changed files with 52 additions and 138 deletions

View File

@@ -43,14 +43,9 @@
<vm:AboutViewModel /> <vm:AboutViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,*,Auto">
<Grid.RowDefinitions> <Grid Grid.Row="0"
<RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" /> ColumnDefinitions="Auto,*">
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border Grid.Column="0" <Border Grid.Column="0"
BorderThickness="5"> BorderThickness="5">
<Image Source="/Assets/avalonia-logo.ico" <Image Source="/Assets/avalonia-logo.ico"
@@ -59,10 +54,8 @@
</Border> </Border>
<Grid Grid.Column="1" <Grid Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center"> VerticalAlignment="Center"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto">
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding SoftwareName}" Text="{Binding SoftwareName}"
HorizontalAlignment="Left" HorizontalAlignment="Left"

View File

@@ -44,18 +44,9 @@
<vm:EditDatViewModel /> <vm:EditDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<Grid.RowDefinitions> <Grid Grid.Row="0"
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> ColumnDefinitions="140,*">
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -68,10 +59,8 @@
Text="{Binding Name}" Text="{Binding Name}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -84,10 +73,8 @@
Text="{Binding Version}" Text="{Binding Version}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="2"> <Grid Grid.Row="2"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -100,10 +87,8 @@
Text="{Binding Author}" Text="{Binding Author}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="3"> <Grid Grid.Row="3"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -116,10 +101,8 @@
Text="{Binding Category}" Text="{Binding Category}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="4"> <Grid Grid.Row="4"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -132,10 +115,8 @@
Text="{Binding Comment}" Text="{Binding Comment}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="5"> <Grid Grid.Row="5"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -148,10 +129,8 @@
Text="{Binding Date}" Text="{Binding Date}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="6"> <Grid Grid.Row="6"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -164,10 +143,8 @@
Text="{Binding Description}" Text="{Binding Description}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="7"> <Grid Grid.Row="7"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -180,10 +157,8 @@
Text="{Binding Homepage}" Text="{Binding Homepage}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="8"> <Grid Grid.Row="8"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -196,10 +171,8 @@
Text="{Binding TotalMachines}" Text="{Binding TotalMachines}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="9"> <Grid Grid.Row="9"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -212,10 +185,8 @@
Text="{Binding CompleteMachines}" Text="{Binding CompleteMachines}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="10"> <Grid Grid.Row="10"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -228,10 +199,8 @@
Text="{Binding IncompleteMachines}" Text="{Binding IncompleteMachines}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="11"> <Grid Grid.Row="11"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -244,10 +213,8 @@
Text="{Binding TotalRoms}" Text="{Binding TotalRoms}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="12"> <Grid Grid.Row="12"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -260,10 +227,8 @@
Text="{Binding HaveRoms}" Text="{Binding HaveRoms}"
Padding="5" /> Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="13"> <Grid Grid.Row="13"
<Grid.ColumnDefinitions> ColumnDefinitions="140,*">
<ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"

View File

@@ -44,11 +44,7 @@
<vm:ExportDatViewModel /> <vm:ExportDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,auto,Auto,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage}" Text="{Binding StatusMessage}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />

View File

@@ -44,12 +44,7 @@
<vm:ExportRomsViewModel /> <vm:ExportRomsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" <StackPanel Grid.Row="0"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">

View File

@@ -44,11 +44,7 @@
<vm:ImportDatViewModel /> <vm:ImportDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,auto,Auto,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage}" Text="{Binding StatusMessage}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />

View File

@@ -44,12 +44,7 @@
<vm:ImportDatFolderViewModel /> <vm:ImportDatFolderViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" <StackPanel Grid.Row="0"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
@@ -57,10 +52,8 @@
FontWeight="Bold" /> FontWeight="Bold" />
<TextBlock Text="{Binding FolderPath}" /> <TextBlock Text="{Binding FolderPath}" />
</StackPanel> </StackPanel>
<Grid Grid.Row="1"> <Grid Grid.Row="1"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"

View File

@@ -44,12 +44,7 @@
<vm:ImportRomFolderViewModel /> <vm:ImportRomFolderViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" <StackPanel Grid.Row="0"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">

View File

@@ -44,10 +44,7 @@
<vm:RemoveDatViewModel /> <vm:RemoveDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage}" Text="{Binding StatusMessage}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />

View File

@@ -43,15 +43,9 @@
<vm:SettingsViewModel /> <vm:SettingsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
<Grid.RowDefinitions> <Grid Grid.Row="0"
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> ColumnDefinitions="*,250,Auto">
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -72,10 +66,8 @@
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1"
<Grid.ColumnDefinitions> ColumnDefinitions="*,250,Auto">
<ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -96,10 +88,8 @@
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="2"> <Grid Grid.Row="2"
<Grid.ColumnDefinitions> ColumnDefinitions="*,250,Auto">
<ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -120,10 +110,8 @@
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="3"> <Grid Grid.Row="3"
<Grid.ColumnDefinitions> ColumnDefinitions="*,250,Auto">
<ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"

View File

@@ -42,11 +42,7 @@
<vm:UpdateStatsViewModel /> <vm:UpdateStatsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Border Padding="15">
<Grid> <Grid RowDefinitions="Auto,Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage}" Text="{Binding StatusMessage}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />