Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
eb0110db
Commit
eb0110db
authored
Dec 10, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MultiLayout
1. 优化 把动态区的控件字体改小了 2. 优化 把按钮区的textblock 自动换行,取消 viewbox
parent
e378cb74
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
PgMainEditDynArea.xaml
MultiLayout/MainEdit/PgMeDynArea/PgMainEditDynArea.xaml
+1
-1
PgMeMenu.xaml
MultiLayout/MainEdit/PgMeMenu/PgMeMenu.xaml
+3
-5
No files found.
MultiLayout/MainEdit/PgMeDynArea/PgMainEditDynArea.xaml
View file @
eb0110db
...
@@ -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">
...
...
MultiLayout/MainEdit/PgMeMenu/PgMeMenu.xaml
View file @
eb0110db
...
@@ -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" >
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment