Merge branch 'beta' of https://github.com/InkCanvasForClass/community into beta
This commit is contained in:
+40
-42
@@ -4952,33 +4952,36 @@
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="0,0,0,0"
|
||||
Width="58"
|
||||
CornerRadius="10"
|
||||
Width="64"
|
||||
CornerRadius="8"
|
||||
Background="{DynamicResource FloatBarBackground}"
|
||||
BorderBrush="{DynamicResource FloatBarBorderBrush}"
|
||||
BorderBrush="#33FFFFFF"
|
||||
BorderThickness="1"
|
||||
SnapsToDevicePixels="True"
|
||||
Visibility="Collapsed"
|
||||
Panel.ZIndex="1001">
|
||||
Panel.ZIndex="1001"
|
||||
ui:ThemeManager.RequestedTheme="Dark">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect BlurRadius="24"
|
||||
ShadowDepth="3"
|
||||
Direction="270"
|
||||
Opacity="0.45"
|
||||
Color="#000000" />
|
||||
</Border.Effect>
|
||||
<Border.Resources>
|
||||
<Style x:Key="PdfSidebarNavButtonStyle" TargetType="Border">
|
||||
<Setter Property="Width" Value="42" />
|
||||
<Setter Property="Height" Value="38" />
|
||||
<Setter Property="CornerRadius" Value="8" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource FloatBarForeground}" />
|
||||
<Setter Property="Width" Value="40" />
|
||||
<Setter Property="Height" Value="36" />
|
||||
<Setter Property="CornerRadius" Value="4" />
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="Background">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="White" Opacity="0.10" />
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="White" Opacity="0.22" />
|
||||
<SolidColorBrush Color="#FFFFFF" Opacity="0.08" />
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Trigger>
|
||||
@@ -4988,22 +4991,19 @@
|
||||
<Grid>
|
||||
<ikw:SimpleStackPanel VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center"
|
||||
Spacing="10"
|
||||
Margin="0,8,0,8">
|
||||
Spacing="8"
|
||||
Margin="0,10,0,10">
|
||||
<TextBlock Text="PDF"
|
||||
FontSize="11"
|
||||
FontSize="10"
|
||||
FontWeight="SemiBold"
|
||||
HorizontalAlignment="Center"
|
||||
Foreground="{DynamicResource FloatBarForeground}"
|
||||
Opacity="0.9" />
|
||||
<Border CornerRadius="8"
|
||||
Padding="6,8"
|
||||
BorderThickness="1"
|
||||
BorderBrush="{DynamicResource FloatBarForeground}"
|
||||
SnapsToDevicePixels="True">
|
||||
<Border.Background>
|
||||
<SolidColorBrush Color="White" Opacity="0.08" />
|
||||
</Border.Background>
|
||||
Opacity="0.78" />
|
||||
<Border CornerRadius="4"
|
||||
Padding="8,6"
|
||||
BorderThickness="0"
|
||||
SnapsToDevicePixels="True"
|
||||
Background="#14FFFFFF">
|
||||
<TextBlock Name="TextBlockPdfSidebarPageLabel"
|
||||
Text="— / —"
|
||||
FontSize="12"
|
||||
@@ -5018,35 +5018,33 @@
|
||||
Style="{StaticResource PdfSidebarNavButtonStyle}"
|
||||
Opacity="0.35"
|
||||
IsHitTestVisible="False"
|
||||
ToolTip="上一页"
|
||||
MouseDown="Border_MouseDown"
|
||||
MouseUp="BorderPdfSidebarPagePrev_MouseUp">
|
||||
<TextBlock Text="‹"
|
||||
FontSize="20"
|
||||
FontWeight="SemiBold"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,-2,0,0"
|
||||
Foreground="{DynamicResource FloatBarForeground}" />
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}"
|
||||
FontSize="14"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource FloatBarForeground}" />
|
||||
</Border>
|
||||
<Border Name="BorderPdfSidebarPageNext"
|
||||
Style="{StaticResource PdfSidebarNavButtonStyle}"
|
||||
Opacity="0.35"
|
||||
IsHitTestVisible="False"
|
||||
ToolTip="下一页"
|
||||
MouseDown="Border_MouseDown"
|
||||
MouseUp="BorderPdfSidebarPageNext_MouseUp">
|
||||
<TextBlock Text="›"
|
||||
FontSize="20"
|
||||
FontWeight="SemiBold"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,-2,0,0"
|
||||
Foreground="{DynamicResource FloatBarForeground}" />
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronRight}"
|
||||
FontSize="14"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{DynamicResource FloatBarForeground}" />
|
||||
</Border>
|
||||
<TextBlock Text="翻页"
|
||||
FontSize="9"
|
||||
HorizontalAlignment="Center"
|
||||
Foreground="{DynamicResource FloatBarForeground}"
|
||||
Opacity="0.65" />
|
||||
Opacity="0.55" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
Reference in New Issue
Block a user