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

Commit 8363f28

Browse files
author
Eric Maupin
committed
[Win] Fix clipping issues with larger fonts
1 parent cb2c690 commit 8363f28

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

Xamarin.PropertyEditing.Windows/Themes/Resources.xaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@
273273
</Style>
274274

275275
<Style TargetType="local:StringEditorControl">
276-
<Setter Property="Height" Value="24" />
277276
<Setter Property="Template">
278277
<Setter.Value>
279278
<ControlTemplate TargetType="local:StringEditorControl">
@@ -292,7 +291,6 @@
292291
</Style>
293292

294293
<Style TargetType="local:BoolEditorControl">
295-
<Setter Property="Height" Value="24" />
296294
<Setter Property="Template">
297295
<Setter.Value>
298296
<ControlTemplate TargetType="local:BoolEditorControl">
@@ -303,7 +301,6 @@
303301
</Style>
304302

305303
<Style TargetType="local:PointEditorControl">
306-
<Setter Property="Height" Value="24" />
307304
<Setter Property="Template">
308305
<Setter.Value>
309306
<ControlTemplate TargetType="local:PointEditorControl">
@@ -1507,6 +1504,7 @@
15071504
</Style>
15081505

15091506
<Style TargetType="local:PropertyPresenter">
1507+
<Setter Property="MinHeight" Value="24" />
15101508
<Setter Property="Template">
15111509
<Setter.Value>
15121510
<ControlTemplate TargetType="local:PropertyPresenter">
@@ -1524,8 +1522,8 @@
15241522
</Grid.RowDefinitions>
15251523

15261524
<ToggleButton Name="delveButton" Grid.Column="0" Style="{DynamicResource StandaloneToggleStyle}" Width="11" Height="11" Visibility="{Binding HasItems,ElementName=subProperties,Converter={StaticResource BoolToVisibilityConverter}}" />
1527-
<TextBlock Name="Label" Grid.Column="1" Text="{TemplateBinding Label}" ToolTip="{Binding Property.Description,Mode=OneTime}" Height="16" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" />
1528-
<ContentPresenter Grid.Column="2" Margin="4,2,0,2" IsEnabled="{Binding Property.CanWrite}" />
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" />
15291527
<local:PropertyButton Grid.Column="3" ValueSource="{Binding ValueSource}" IsEnabled="{Binding Property.CanWrite,Mode=OneTime}"/>
15301528

15311529
<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}">
@@ -2030,7 +2028,6 @@
20302028
</local:NumericTemplateSelector>
20312029

20322030
<Style TargetType="local:NumericEditorControl">
2033-
<Setter Property="Height" Value="24" />
20342031
<Setter Property="Template">
20352032
<Setter.Value>
20362033
<ControlTemplate TargetType="local:NumericEditorControl">
@@ -2050,20 +2047,14 @@
20502047
</Style>
20512048

20522049
<Style TargetType="local:IntegerUpDownControl" BasedOn="{StaticResource {x:Type local:TextBoxEx}}">
2053-
<Setter Property="Height" Value="24" />
2054-
<Setter Property="MinHeight" Value="20" />
20552050
<Setter Property="FocusSelectsAll" Value="True" />
20562051
</Style>
20572052

20582053
<Style TargetType="local:DoubleUpDownControl" BasedOn="{StaticResource {x:Type local:TextBoxEx}}">
2059-
<Setter Property="Height" Value="24" />
2060-
<Setter Property="MinHeight" Value="20" />
20612054
<Setter Property="FocusSelectsAll" Value="True" />
20622055
</Style>
20632056

20642057
<Style TargetType="local:ByteUpDownControl" BasedOn="{StaticResource {x:Type local:TextBoxEx}}">
2065-
<Setter Property="Height" Value="24" />
2066-
<Setter Property="MinHeight" Value="20" />
20672058
<Setter Property="FocusSelectsAll" Value="True" />
20682059
</Style>
20692060

0 commit comments

Comments
 (0)