Merge pull request #91 from denglihong2007/dev

fix: 绵阳站站台看板宽度问题
This commit is contained in:
denglihong2007
2025-04-10 12:11:03 +08:00
committed by GitHub

View File

@@ -25,7 +25,7 @@
<ScaleTransform ScaleX="1.25" ScaleY="1"/>
</TextBlock.LayoutTransform>
</TextBlock>
<Grid Margin="4">
<Grid Margin="4" MinWidth="347">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
@@ -46,20 +46,22 @@
<TextBlock Grid.Column="2" Visibility="{Binding Screen[0].Landmark,Converter={StaticResource EmptyToVisibilityConverter}}" Text="{Binding Screen[0].Landmark}" Foreground="Red" FontWeight="Bold"/>
<TextBlock Grid.Column="3" Visibility="{Binding Screen[0].Landmark,Converter={StaticResource EmptyToVisibilityConverter}}" Text="地标" Foreground="Red" FontWeight="Bold"/>
</Grid>
<Grid Grid.Row="1" Margin="0,10,0,10">
<Grid Grid.Row="1" Margin="0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding Screen[0].DepartureTime,Converter={StaticResource DateTimeToStringConverter}}" Foreground="LawnGreen" FontSize="25"/>
<TextBlock Grid.Column="1" Text="开" Foreground="LawnGreen" FontSize="25" Margin="5,0,0,0"/>
<TextBlock Grid.Column="3" Text="{Binding Screen[0].Origin}" Foreground="LawnGreen" FontSize="25" Margin="15,0"/>
<TextBlock Grid.Column="4" Text="开往" Foreground="LawnGreen" FontSize="25"/>
<TextBlock Grid.Column="5" Text="{Binding Screen[0].Terminal}" Foreground="LawnGreen" FontSize="25" Margin="15,0,4,0"/>
<TextBlock Grid.Column="3" Text="{Binding Screen[0].Origin}" Foreground="LawnGreen" FontSize="25"/>
<TextBlock Grid.Column="5" Text="开往" Foreground="LawnGreen" FontSize="25"/>
<TextBlock Grid.Column="7" Text="{Binding Screen[0].Terminal}" Foreground="LawnGreen" FontSize="25" Margin="0,0,4,0"/>
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>