mirror of
https://github.com/MaSzyna-EU07/StarterNG.git
synced 2026-11-06 05:38:35 +01:00
Drop value wrapping, raise the detail row by one line
192 to 207 px, the height of one more reading. Values go back to a single ellipsised line.
This commit is contained in:
@@ -212,7 +212,7 @@
|
|||||||
longest label in whichever panel it lands in, so no pixel count is picked
|
longest label in whichever panel it lands in, so no pixel count is picked
|
||||||
here and it follows the translation. -->
|
here and it follows the translation. -->
|
||||||
<Style Selector="ctl|SettingRow.Compact">
|
<Style Selector="ctl|SettingRow.Compact">
|
||||||
<Setter Property="Margin" Value="0,0,0,3" />
|
<Setter Property="Margin" Value="0,0,0,5" />
|
||||||
</Style>
|
</Style>
|
||||||
<!-- Right-aligned: an Auto column hugs the longest label, so anything shorter
|
<!-- Right-aligned: an Auto column hugs the longest label, so anything shorter
|
||||||
would otherwise hang in space away from its own control. MaxWidth stops one
|
would otherwise hang in space away from its own control. MaxWidth stops one
|
||||||
@@ -232,14 +232,6 @@
|
|||||||
<Setter Property="MinWidth" Value="26" />
|
<Setter Property="MinWidth" Value="26" />
|
||||||
<Setter Property="Margin" Value="6,0,0,0" />
|
<Setter Property="Margin" Value="6,0,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
<!-- A read-only row has no widget, so its value owns the rest of the line and
|
|
||||||
can wrap onto a second one. Ellipsis is right for a reading that shares the
|
|
||||||
row with a control, but here it hides the end of names that are the whole
|
|
||||||
point of the panel - an operator, a depot, a texture author. -->
|
|
||||||
<Style Selector="ctl|SettingRow.Compact:no-content /template/ TextBlock#PART_Value">
|
|
||||||
<Setter Property="TextWrapping" Value="Wrap" />
|
|
||||||
<Setter Property="TextTrimming" Value="None" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="ctl|SettingRow.Compact /template/ TextBlock#PART_Description">
|
<Style Selector="ctl|SettingRow.Compact /template/ TextBlock#PART_Description">
|
||||||
<Setter Property="Margin" Value="0,2,0,0" />
|
<Setter Property="Margin" Value="0,2,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|||||||
@@ -19,13 +19,11 @@
|
|||||||
<!-- The vehicle panel keeps its old height on a roomy window (MaxHeight)
|
<!-- The vehicle panel keeps its old height on a roomy window (MaxHeight)
|
||||||
but shrinks with everything else towards the 666 px floor instead of
|
but shrinks with everything else towards the 666 px floor instead of
|
||||||
being clipped. The consist row measures itself, so a whole card fits
|
being clipped. The consist row measures itself, so a whole card fits
|
||||||
whether the thumbnails are the small ones or the large ones.
|
whether the thumbnails are the small ones or the large ones. Row 1's
|
||||||
Row 1's cap is set by the texture tab: skin, operator, depot, revision
|
cap fits the seven lines of the texture tab. -->
|
||||||
date and place, texture and photo author, some of which wrap onto a
|
|
||||||
second line in this width. -->
|
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="*" MinHeight="150" />
|
<RowDefinition Height="*" MinHeight="150" />
|
||||||
<RowDefinition Height="1.57*" MinHeight="120" MaxHeight="248" />
|
<RowDefinition Height="1.57*" MinHeight="120" MaxHeight="207" />
|
||||||
<RowDefinition Height="Auto" MinHeight="140" MaxHeight="230" />
|
<RowDefinition Height="Auto" MinHeight="140" MaxHeight="230" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
@@ -158,16 +156,16 @@
|
|||||||
<Border Grid.Row="1" Grid.Column="0" TabIndex="4"
|
<Border Grid.Row="1" Grid.Column="0" TabIndex="4"
|
||||||
Background="{StaticResource CarbonPanelBg}"
|
Background="{StaticResource CarbonPanelBg}"
|
||||||
BorderBrush="{StaticResource CarbonBorderLight}"
|
BorderBrush="{StaticResource CarbonBorderLight}"
|
||||||
BorderThickness="1" CornerRadius="2" Padding="4">
|
BorderThickness="1" CornerRadius="2" Padding="6">
|
||||||
<TabControl>
|
<TabControl>
|
||||||
<TabItem Header="{Binding [GeneralInfo], Source={x:Static starterNg:App.Loc}}">
|
<TabItem Header="{Binding [GeneralInfo], Source={x:Static starterNg:App.Loc}}">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||||
<StackPanel Name="generalPanel" Margin="4,2" Grid.IsSharedSizeScope="True" />
|
<StackPanel Name="generalPanel" Margin="4" Grid.IsSharedSizeScope="True" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="{Binding [AboutTexture], Source={x:Static starterNg:App.Loc}}">
|
<TabItem Header="{Binding [AboutTexture], Source={x:Static starterNg:App.Loc}}">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||||
<StackPanel Name="consistTexturePanel" Margin="4,2" Grid.IsSharedSizeScope="True" />
|
<StackPanel Name="consistTexturePanel" Margin="4" Grid.IsSharedSizeScope="True" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|||||||
Reference in New Issue
Block a user