Ver código fonte

Fixed popup margins

Kenric Nugteren 5 meses atrás
pai
commit
0fb1e1943e

+ 1 - 0
PRS.Avalonia/Directory.Packages.props

@@ -7,6 +7,7 @@
     <!-- Avalonia packages -->
     <!-- Important: keep version in sync! -->
     <PackageVersion Include="Autofac" Version="8.2.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.4" />
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.3" />
     <PackageVersion Include="Avalonia.Native" Version="11.2.3" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />

+ 6 - 1
PRS.Avalonia/PRS.Avalonia/MainView.axaml

@@ -4,12 +4,17 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:PRS.Avalonia"
 			 xmlns:dialogHostAvalonia="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+			 xmlns:positioners="clr-namespace:DialogHostAvalonia.Positioners;assembly=DialogHost.Avalonia"
              xmlns:components="clr-namespace:InABox.Avalonia.Components;assembly=InABox.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PRS.Avalonia.Modules.MainView"
              x:DataType="avalonia:MainViewModel">
 
-	<dialogHostAvalonia:DialogHost CloseOnClickAway="True" DialogMargin="20">
+	<dialogHostAvalonia:DialogHost CloseOnClickAway="True" DialogMargin="10">
+		<dialogHostAvalonia:DialogHost.PopupPositioner>
+			<positioners:AlignmentDialogPopupPositioner HorizontalAlignment="Center" VerticalAlignment="Center"
+														Margin="20"/>
+		</dialogHostAvalonia:DialogHost.PopupPositioner>
 		<Grid Background="{StaticResource PrsSurfaceBackground}">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="45" />

+ 3 - 0
PRS.Avalonia/PRS.Avalonia/MainView.axaml.cs

@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using DialogHostAvalonia.Positioners;
+using System;
 
 namespace PRS.Avalonia.Modules;
 

+ 4 - 3
PRS.Avalonia/PRS.Avalonia/Modules/EquipmentModule/EquipmentMaps/EquipmentMapsMenuView.axaml

@@ -16,11 +16,12 @@
 			<ColumnDefinition Width="*"/>
 		</Grid.ColumnDefinitions>
 
-		<DataGrid x:Name="Grid" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+		<DataGrid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
 				  ItemsSource="{Binding Items}">
 			<DataGrid.Columns>
-				<DataGridCheckBoxColumn Header="Selected?" Binding="{Binding Selected}"/>
-				<DataGridTextColumn Header="Select Categories" Binding="{Binding Description}"/>
+				<DataGridCheckBoxColumn Header="" Binding="{Binding Selected}"/>
+				<DataGridTextColumn Header="Select Categories" Binding="{Binding Description}"
+									IsReadOnly="True"/>
 			</DataGrid.Columns>
 		</DataGrid>
 		

+ 2 - 1
PRS.Avalonia/PRS.Avalonia/Modules/EquipmentModule/EquipmentMaps/EquipmentMapsMenuViewModel.cs

@@ -1,4 +1,5 @@
-using Avalonia.Threading;
+using Avalonia.Controls;
+using Avalonia.Threading;
 using Comal.Classes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;

+ 1 - 0
PRS.Avalonia/PRS.Avalonia/PRS.Avalonia.csproj

@@ -302,6 +302,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Avalonia.Controls.DataGrid" />
         <PackageReference Include="Avalonia.Fonts.Inter" />
         <PackageReference Include="Avalonia.Themes.Fluent" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->