Просмотр исходного кода

zhao:修改跳转UI

tags/录制修改前
耀 4 лет назад
Родитель
Сommit
6745e01107
1 измененных файлов: 9 добавлений и 14 удалений
  1. 9
    14
      XHWK.WKTool/XHMicroLessonSystemWindow.xaml

+ 9
- 14
XHWK.WKTool/XHMicroLessonSystemWindow.xaml Просмотреть файл

@@ -639,8 +639,8 @@
639 639
                     <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
640 640
                 </StackPanel>
641 641
                 <!--页码-->
642
-                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Hidden" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="95,0,0,0">
643
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="215" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
642
+                <Grid Grid.Row="1" x:Name="gridPage" Visibility="Hidden" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="97,0,0,0">
643
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="220" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
644 644
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
645 645
                     x:Name="last_button"
646 646
                     Width="28" Height="20"
@@ -652,9 +652,9 @@
652 652
                         </Button>
653 653
                         <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
654 654
                             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"  Background="Transparent">
655
-                                <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0"/>
656
-                                <TextBlock Text="/" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown"/>
657
-                                <TextBlock x:Name="txbTotalpage" Text="{Binding pagenum}" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" MouseLeftButtonDown="txbCurrpage_MouseLeftButtonDown"/>
655
+                                <TextBlock x:Name="txbCurrpage" Text="{Binding currpage}" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0"/>
656
+                                <TextBlock Text="/" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" />
657
+                                <TextBlock x:Name="txbTotalpage" Text="{Binding pagenum}" TextAlignment="Center" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center"/>
658 658
                             </StackPanel>
659 659
                         </Grid>
660 660
                         <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
@@ -666,7 +666,7 @@
666 666
                             </StackPanel>
667 667
                         </Button>
668 668
 
669
-                        <TextBlock Text="前往" Height="18" Margin="0,5,3,0"></TextBlock>
669
+                        <TextBlock Text="前往" Height="22" Margin="0,5,3,0" FontSize="15"></TextBlock>
670 670
                         <!--<TextBox x:Name="txtJump" Text="123" Height="17" Width="25" Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0"  input:InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txtJump_PreviewTextInput" KeyDown="txtJump_KeyDown"/>-->
671 671
                         <!--<Button Cursor="Hand" Visibility="Visible" x:Name="BtnJumpPage" HorizontalAlignment="Left"  VerticalAlignment="Center" Width="17" Height="17" Background="White" BorderBrush="#FFABADB3" Margin="24,0,0,0" Click="BtnJumpPage_Click">
672 672
                             <Button.Resources>
@@ -678,13 +678,8 @@
678 678
                             <Image Source="/星火微课;component/Images/VideoList_OK.png" Margin="2,2,2,2"></Image>
679 679
                         </Button>-->
680 680
 
681
-                        <ComboBox Cursor="Hand" Width="50" Height="20"
682
-                                x:Name="CbxPageList"
683
-                                VerticalContentAlignment="Center"
684
-                                BorderThickness="1"
685
-                                FontSize="13" SelectedIndex="-1"
686
-                                  DisplayMemberPath="PageName" SelectedValuePath="PageCode" SelectionChanged="CbxPageList_SelectionChanged"
687
-                                >
681
+                        <ComboBox Cursor="Hand" Width="55" Height="24" x:Name="CbxPageList" VerticalContentAlignment="Center" BorderThickness="1" FontSize="15" SelectedIndex="-1"
682
+                        DisplayMemberPath="PageName" SelectedValuePath="PageCode" SelectionChanged="CbxPageList_SelectionChanged" VerticalAlignment="Center" HorizontalAlignment="Center">
688 683
                             <ComboBox.Background>
689 684
                                 <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
690 685
                                     <GradientStop Color="#FFF0F0F0" Offset="0"/>
@@ -692,7 +687,7 @@
692 687
                                 </LinearGradientBrush>
693 688
                             </ComboBox.Background>
694 689
                         </ComboBox>
695
-                        <TextBlock Text="页" Height="18" Margin="3,5,0,0"></TextBlock>
690
+                        <TextBlock Text="页" Height="22" Margin="3,5,0,0" FontSize="15"></TextBlock>
696 691
 
697 692
                     </StackPanel>
698 693
                 </Grid>

Загрузка…
Отмена
Сохранить