Skip to content
This repository was archived by the owner on Sep 25, 2024. It is now read-only.

Commit 7fccbe8

Browse files
author
Eric Maupin
committed
[Win] Better align label with editor content
By aligning rows at a minimum 24 height at 0,2,0,2 padding we can create a row to center the text in to keep it aligned with the editor text in that row.
1 parent 0113e77 commit 7fccbe8

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Xamarin.PropertyEditing.Windows/Themes/Resources.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,16 +1517,17 @@
15171517
<ColumnDefinition Name="propertyButtonColumn" Width="12" />
15181518
</Grid.ColumnDefinitions>
15191519
<Grid.RowDefinitions>
1520-
<RowDefinition Height="Auto" />
1520+
<RowDefinition Height="Auto" MinHeight="24" />
1521+
<RowDefinition Height="*" />
15211522
<RowDefinition Height="Auto" />
15221523
</Grid.RowDefinitions>
15231524

15241525
<ToggleButton Name="delveButton" Grid.Column="0" Style="{DynamicResource StandaloneToggleStyle}" Width="11" Height="11" Visibility="{Binding HasItems,ElementName=subProperties,Converter={StaticResource BoolToVisibilityConverter}}" />
1525-
<TextBlock Name="Label" Grid.Column="1" Text="{TemplateBinding Label}" ToolTip="{Binding Property.Description,Mode=OneTime}" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" />
1526-
<ContentPresenter Grid.Column="2" Margin="4,2,0,2" IsEnabled="{Binding Property.CanWrite}" MinHeight="20" />
1527-
<local:PropertyButton Grid.Column="3" ValueSource="{Binding ValueSource}" IsEnabled="{Binding Property.CanWrite,Mode=OneTime}"/>
1526+
<TextBlock Name="Label" Margin="0,3,0,3" Grid.Row="0" Grid.Column="1" Text="{TemplateBinding Label}" ToolTip="{Binding Property.Description,Mode=OneTime}" VerticalAlignment="Center" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" />
1527+
<ContentPresenter Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="4,2,0,2" IsEnabled="{Binding Property.CanWrite}" MinHeight="20" />
1528+
<local:PropertyButton Grid.Row="0" Grid.RowSpan="2" Grid.Column="3" ValueSource="{Binding ValueSource}" IsEnabled="{Binding Property.CanWrite,Mode=OneTime}"/>
15281529

1529-
<ItemsControl Name="subProperties" Background="{DynamicResource PanelGroupSecondaryBackgroundBrush}" Margin="-19,0,0,0" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" ItemsSource="{TemplateBinding ItemsSource}" ItemTemplate="{DynamicResource PropertyEditorTemplate}">
1530+
<ItemsControl Name="subProperties" Background="{DynamicResource PanelGroupSecondaryBackgroundBrush}" Margin="-19,0,0,0" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" ItemsSource="{TemplateBinding ItemsSource}" ItemTemplate="{DynamicResource PropertyEditorTemplate}">
15301531
<ItemsControl.Visibility>
15311532
<MultiBinding Converter="{StaticResource BoolsToVisibilityConverter}">
15321533
<Binding ElementName="delveButton" Path="IsChecked" />

0 commit comments

Comments
 (0)