Skip to content

Commit 27c9379

Browse files
NaBianNaBian
committed
fix: close #1707 
1 parent cab6fb0 commit 27c9379

File tree

3 files changed

+49
-43
lines changed

3 files changed

+49
-43
lines changed

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8906,23 +8906,25 @@
89068906
<Setter.Value>
89078907
<ControlTemplate TargetType="FlowDocumentScrollViewer">
89088908
<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
8909-
<Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
8910-
<Grid.ColumnDefinitions>
8911-
<ColumnDefinition Width="*" />
8912-
<ColumnDefinition Width="*" />
8913-
</Grid.ColumnDefinitions>
8914-
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
8915-
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
8909+
<Decorator x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
8910+
<Grid>
89168911
<Grid.ColumnDefinitions>
8917-
<ColumnDefinition Width="Auto" />
8918-
<ColumnDefinition />
8919-
<ColumnDefinition Width="Auto" />
8912+
<ColumnDefinition Width="*" />
8913+
<ColumnDefinition Width="*" />
89208914
</Grid.ColumnDefinitions>
8921-
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
8922-
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
8923-
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
8915+
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
8916+
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
8917+
<Grid.ColumnDefinitions>
8918+
<ColumnDefinition Width="Auto" />
8919+
<ColumnDefinition />
8920+
<ColumnDefinition Width="Auto" />
8921+
</Grid.ColumnDefinitions>
8922+
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
8923+
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
8924+
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
8925+
</Grid>
89248926
</Grid>
8925-
</Grid>
8927+
</Decorator>
89268928
<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
89278929
<ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
89288930
</Border>

‎src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,25 @@
1616
<Setter.Value>
1717
<ControlTemplate TargetType="FlowDocumentScrollViewer">
1818
<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
19-
<Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
20-
<Grid.ColumnDefinitions>
21-
<ColumnDefinition Width="*"/>
22-
<ColumnDefinition Width="*"/>
23-
</Grid.ColumnDefinitions>
24-
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center"/>
25-
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
19+
<Decorator x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
20+
<Grid>
2621
<Grid.ColumnDefinitions>
27-
<ColumnDefinition Width="Auto"/>
28-
<ColumnDefinition/>
29-
<ColumnDefinition Width="Auto"/>
22+
<ColumnDefinition Width="*"/>
23+
<ColumnDefinition Width="*"/>
3024
</Grid.ColumnDefinitions>
31-
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}"/>
32-
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180"/>
33-
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}"/>
25+
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center"/>
26+
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
27+
<Grid.ColumnDefinitions>
28+
<ColumnDefinition Width="Auto"/>
29+
<ColumnDefinition/>
30+
<ColumnDefinition Width="Auto"/>
31+
</Grid.ColumnDefinitions>
32+
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}"/>
33+
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180"/>
34+
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}"/>
35+
</Grid>
3436
</Grid>
35-
</Grid>
37+
</Decorator>
3638
<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
3739
<ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
3840
</Border>
@@ -183,5 +185,5 @@
183185
</Setter.Value>
184186
</Setter>
185187
</Style>
186-
188+
187189
</ResourceDictionary>

‎src/Shared/HandyControl_Shared/Themes/Theme.xaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9025,23 +9025,25 @@
90259025
<Setter.Value>
90269026
<ControlTemplate TargetType="FlowDocumentScrollViewer">
90279027
<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
9028-
<Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
9029-
<Grid.ColumnDefinitions>
9030-
<ColumnDefinition Width="*" />
9031-
<ColumnDefinition Width="*" />
9032-
</Grid.ColumnDefinitions>
9033-
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
9034-
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
9028+
<Decorator x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
9029+
<Grid>
90359030
<Grid.ColumnDefinitions>
9036-
<ColumnDefinition Width="Auto" />
9037-
<ColumnDefinition />
9038-
<ColumnDefinition Width="Auto" />
9031+
<ColumnDefinition Width="*" />
9032+
<ColumnDefinition Width="*" />
90399033
</Grid.ColumnDefinitions>
9040-
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
9041-
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
9042-
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
9034+
<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
9035+
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
9036+
<Grid.ColumnDefinitions>
9037+
<ColumnDefinition Width="Auto" />
9038+
<ColumnDefinition />
9039+
<ColumnDefinition Width="Auto" />
9040+
</Grid.ColumnDefinitions>
9041+
<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
9042+
<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
9043+
<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
9044+
</Grid>
90439045
</Grid>
9044-
</Grid>
9046+
</Decorator>
90459047
<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
90469048
<ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
90479049
</Border>

0 commit comments

Comments
 (0)