工具栏优化

PDF Office/Views/ViewContent.xaml

@@ -437,7 +437,7 @@
                 </ToggleButton>
             </StackPanel>
 
-            <!--<ScrollViewer
+            <ScrollViewer
                 x:Name="ScrViewTab"
                 Margin="170,0,128,0"
                 VerticalAlignment="Center"
@@ -457,110 +457,6 @@
                     Style="{StaticResource TabControlWithUnderLineStyle}"
                     Visibility="{Binding IsReadMode}">
 
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemAnnotation"
-                        Header="{Binding T_Annotation}"
-                        Style="{StaticResource ToolbarTabs}">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemPageEdit"
-                        Header="{Binding T_PageEdit}"
-                        Style="{StaticResource ToolbarTabs}" />
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemConvert"
-                        Header="{Binding T_Converter}"
-                        Style="{StaticResource ToolbarTabs}" />
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemScan"
-                        Header="扫描和OCR"
-                        Style="{StaticResource ToolbarTabs}"
-                        Visibility="Collapsed">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemEdit"
-                        Height="40"
-                        Header="编辑"
-                        Style="{StaticResource ToolbarTabs}"
-                        Visibility="Collapsed">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemForm"
-                        Height="40"
-                        Header="表单"
-                        Style="{StaticResource ToolbarTabs}"
-                        Visibility="Collapsed">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemFill"
-                        Height="40"
-                        Header="{Binding T_FillSign}"
-                        Style="{StaticResource ToolbarTabs}">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <cus:IconAndTextTabItem
-                        x:Name="TabItemTool"
-                        Height="40"
-                        Header="{Binding T_Tools}"
-                        Style="{StaticResource ToolbarTabs}">
-                        <Grid Grid.Row="1" Height="40" />
-                    </cus:IconAndTextTabItem>
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="SelectionChanged">
-                            <i:InvokeCommandAction Command="{Binding TabControlSelectionChangedCommand}" PassEventArgsToCommand="True" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TabControl>
-            </ScrollViewer>-->
-
-            <ScrollViewer HorizontalScrollBarVisibility="Auto" Margin="170,0,128,0">
-                <ScrollViewer.Template>
-                    <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                        <Grid>
-                           
-                           
-                            <ScrollContentPresenter Grid.Row="1" Grid.Column="1"/>
-                            <ScrollBar Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Minimum="0" Maximum="{TemplateBinding ScrollableWidth}" ViewportSize="{TemplateBinding ViewportWidth}" Value="{TemplateBinding HorizontalOffset}" SmallChange="1">
-                                <ScrollBar.Template>
-                                    <ControlTemplate TargetType="{x:Type ScrollBar}">
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="0"/>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition Height="0"/>
-                                            </Grid.RowDefinitions>
-                                            <RepeatButton Grid.Row="1" Command="{x:Static ScrollBar.LineLeftCommand}" Content="&lt;" Width="20" Background="Transparent" BorderBrush="Transparent"/>
-                                            <Thumb x:Name="Thumb" Grid.Row="1" Background="Gray" Width="20" Height="20" Margin="5,0,5,0">
-                                                <Thumb.Template>
-                                                    <ControlTemplate TargetType="{x:Type Thumb}">
-                                                        <Rectangle Fill="{TemplateBinding Background}"/>
-                                                    </ControlTemplate>
-                                                </Thumb.Template>
-                                            </Thumb>
-                                            <RepeatButton Grid.Row="1" Command="{x:Static ScrollBar.LineRightCommand}" Content="&gt;" Width="20" Background="Transparent" BorderBrush="Transparent"/>
-                                        </Grid>
-                                    </ControlTemplate>
-                                </ScrollBar.Template>
-                            </ScrollBar>
-                            <ScrollBar Grid.Row="1" Grid.Column="2" Orientation="Vertical" Minimum="0" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Value="{TemplateBinding VerticalOffset}" SmallChange="1"/>
-                        </Grid>
-                    </ControlTemplate>
-                </ScrollViewer.Template>
-              <TabControl
-                    x:Name="ToolTabControl"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Top"
-                    BorderThickness="0"
-                    PreviewMouseLeftButtonDown="ToolTabControl_PreviewMouseLeftButtonDown"
-                    SelectedIndex="{Binding TabSelectedIndex, Mode=TwoWay}"
-                    Style="{StaticResource TabControlWithUnderLineStyle}"
-                    Visibility="{Binding IsReadMode}">
-
                     <cus:IconAndTextTabItem
                         x:Name="TabItemAnnotation"
                         Header="{Binding T_Annotation}"
@@ -619,6 +515,8 @@
                     </i:Interaction.Triggers>
                 </TabControl>
             </ScrollViewer>
+
+     
         </Grid>
 
         <!--  底部工具栏  -->

PDF Office/Views/ViewContent.xaml.cs

@@ -512,12 +512,12 @@ namespace PDF_Master.Views
 
         private void ButLeft_Click(object sender, RoutedEventArgs e)
         {
-      /*      ScrViewTab.LineLeft()*/;
+           ScrViewTab.LineLeft();
         }
 
         private void ButRight_Click(object sender, RoutedEventArgs e)
         {
-            //ScrViewTab.LineRight();
+            ScrViewTab.LineRight();
         }
 
         private void ScrViewTab_ScrollChanged(object sender, ScrollChangedEventArgs e)