Commit eb0110db authored by 潘栩锋's avatar 潘栩锋 🚴

MultiLayout

1. 优化 把动态区的控件字体改小了
2. 优化 把按钮区的textblock 自动换行,取消 viewbox
parent e378cb74
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<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="15" 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"
Click="button_componentDel_Click"> Click="button_componentDel_Click">
......
...@@ -152,17 +152,15 @@ ...@@ -152,17 +152,15 @@
<Setter Property="Foreground" Value="White"/> <Setter Property="Foreground" Value="White"/>
<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="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>
</ControlTemplate.Resources> </ControlTemplate.Resources>
<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"/>
<Viewbox Margin="3" MaxHeight="12"> <TextBlock Margin="3" Text="{TemplateBinding Content}" />
<TextBlock Text="{TemplateBinding Content}" />
</Viewbox>
</StackPanel> </StackPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
...@@ -225,7 +223,7 @@ ...@@ -225,7 +223,7 @@
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_menu}"/> <Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_menu}"/>
</StackPanel.Resources> </StackPanel.Resources>
<Button> <Button>
□□ 测厚.扫描图12312123123
</Button> </Button>
</StackPanel> </StackPanel>
<Viewbox Grid.Column="1" Margin="5" MaxWidth="250" VerticalAlignment="Top" Opacity="0.5" > <Viewbox Grid.Column="1" Margin="5" MaxWidth="250" VerticalAlignment="Top" Opacity="0.5" >
......
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