|
@@ -143,9 +143,9 @@
|
143
|
143
|
<Grid x:Name="GridContent" Height="1030" Width="1276">
|
144
|
144
|
<!--分3行-->
|
145
|
145
|
<Grid.RowDefinitions>
|
146
|
|
- <RowDefinition Height="100"/>
|
|
146
|
+ <RowDefinition Height="auto"/>
|
147
|
147
|
<RowDefinition Height="*"/>
|
148
|
|
- <RowDefinition Height="50"/>
|
|
148
|
+ <RowDefinition Height="auto"/>
|
149
|
149
|
</Grid.RowDefinitions>
|
150
|
150
|
<Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px">
|
151
|
151
|
<Grid.RowDefinitions>
|
|
@@ -577,19 +577,19 @@
|
577
|
577
|
<Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
|
578
|
578
|
|
579
|
579
|
|
580
|
|
- <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnRed_Click">
|
|
580
|
+ <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
|
581
|
581
|
<Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
|
582
|
582
|
</Button>
|
583
|
|
- <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnGray_Click">
|
|
583
|
+ <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
|
584
|
584
|
<Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
|
585
|
585
|
</Button>
|
586
|
|
- <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnCyanBlue_Click">
|
|
586
|
+ <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
|
587
|
587
|
<Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
|
588
|
588
|
</Button>
|
589
|
|
- <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnYellow_Click">
|
|
589
|
+ <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
|
590
|
590
|
<Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
|
591
|
591
|
</Button>
|
592
|
|
- <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnBlue_Click">
|
|
592
|
+ <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
|
593
|
593
|
<Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
|
594
|
594
|
</Button>
|
595
|
595
|
<TextBlock Text="粗细:" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
|