Commit 4ab6da71 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 MultiLayout 编辑界面框,字太长,无法显示完

parent a33ff2f8
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{TemplateBinding Content}" TextWrapping = "Wrap" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="5"/> <TextBlock Text="{TemplateBinding Content}" TextWrapping = "Wrap" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="5"/>
<Button Grid.Column="1" x:Name="button_close" Style="{StaticResource ButtonStyle_empty}" Margin="5" Background="Transparent" VerticalAlignment="Top" HorizontalAlignment="Right" <Button Grid.Column="1" x:Name="button_close" Style="{StaticResource ButtonStyle_empty}" Margin="5" Background="Transparent" VerticalAlignment="Top" HorizontalAlignment="Right"
......
...@@ -199,8 +199,11 @@ ...@@ -199,8 +199,11 @@
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Button Style="{StaticResource ButtonStyle_empty}" Background="{Binding Background}" Tag="{Binding .}" Click="button_componentNew_Click" Margin="5"> <Button Style="{StaticResource ButtonStyle_empty}" Background="{Binding Background}" Tag="{Binding .}" Click="button_componentNew_Click" Margin="5">
<StackPanel Orientation="Vertical" Margin="10"> <StackPanel Margin="10">
<TextBlock Text="{Binding Header}" FontSize="20" /> <Viewbox Margin="3" MaxHeight="15">
<TextBlock Text="{Binding Header}" FontSize="15" />
</Viewbox>
<TextBlock Text="{Binding Count}" FontSize="15" Margin="0,20,0,0"/> <TextBlock Text="{Binding Count}" FontSize="15" Margin="0,20,0,0"/>
</StackPanel> </StackPanel>
</Button> </Button>
......
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
<Setter Property="TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center"/>
<Setter Property="FontSize" Value="12"/> <Setter Property="FontSize" Value="12"/>
<Setter Property="FontFamily" Value="YouYuan"/> <Setter Property="FontFamily" Value="YouYuan"/>
<Setter Property="Margin" Value="3"/>
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>
...@@ -161,7 +160,9 @@ ...@@ -161,7 +160,9 @@
<Border Background="Transparent" > <Border Background="Transparent" >
<StackPanel Margin="5"> <StackPanel Margin="5">
<Rectangle Height="36" Width="36" Stroke="White" StrokeThickness="4"/> <Rectangle Height="36" Width="36" Stroke="White" StrokeThickness="4"/>
<TextBlock Text="{TemplateBinding Content}"/> <Viewbox Margin="3" MaxHeight="12">
<TextBlock Text="{TemplateBinding Content}" />
</Viewbox>
</StackPanel> </StackPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment