Merge branch 'beta' of https://github.com/InkCanvasForClass/community into beta
This commit is contained in:
+34
-32
@@ -4726,7 +4726,7 @@
|
||||
BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
|
||||
Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -4750,7 +4750,7 @@
|
||||
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
|
||||
Name="BtnLeftPageListWB"
|
||||
BorderThickness="1,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<TextBlock HorizontalAlignment="Center"
|
||||
Text="{Binding ElementName=TextBlockWhiteBoardIndexInfo, Path=Text}"
|
||||
@@ -4816,7 +4816,7 @@
|
||||
CornerRadius="0,5,5,0"
|
||||
IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
|
||||
BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -4842,7 +4842,7 @@
|
||||
<Border Width="60" Height="50"
|
||||
BorderThickness="1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -4902,8 +4902,9 @@
|
||||
HorizontalAlignment="Center" FontSize="12" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<Grid Width="0" Margin="0,0,0,5">
|
||||
<Border ClipToBounds="True" Name="BoardTwoFingerGestureBorder"
|
||||
<Border>
|
||||
<Grid Width="0" Margin="0,0,0,5" RenderTransformOrigin="0,1">
|
||||
<Border ClipToBounds="True" x:Name="BoardTwoFingerGestureBorder"
|
||||
Margin="-115,-161,-55,50"
|
||||
CornerRadius="8"
|
||||
Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
|
||||
@@ -4939,7 +4940,7 @@
|
||||
VerticalAlignment="Center" />
|
||||
<Viewbox Width="36" Height="18" Margin="4,0,0,0">
|
||||
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
|
||||
Name="BoardToggleSwitchEnableMultiTouchMode"
|
||||
x:Name="BoardToggleSwitchEnableMultiTouchMode"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
IsOn="False"
|
||||
OnContent=""
|
||||
@@ -4958,7 +4959,7 @@
|
||||
</Viewbox>
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel
|
||||
Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}"
|
||||
Opacity="{Binding Opacity, ElementName=TwoFingerGestureSimpleStackPanel}"
|
||||
Orientation="Horizontal" Spacing="4"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center">
|
||||
@@ -4970,7 +4971,7 @@
|
||||
VerticalAlignment="Center" />
|
||||
<Viewbox Width="36" Height="18" Margin="4,0,0,0">
|
||||
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
|
||||
Name="BoardToggleSwitchEnableTwoFingerTranslate"
|
||||
x:Name="BoardToggleSwitchEnableTwoFingerTranslate"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
IsOn="False"
|
||||
OnContent=""
|
||||
@@ -4989,7 +4990,7 @@
|
||||
</Viewbox>
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel
|
||||
Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}"
|
||||
Opacity="{Binding Opacity, ElementName=TwoFingerGestureSimpleStackPanel}"
|
||||
Orientation="Horizontal" Spacing="4"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center">
|
||||
@@ -5003,7 +5004,7 @@
|
||||
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
IsOn="False" OnContent="" OffContent=""
|
||||
Name="BoardToggleSwitchEnableTwoFingerZoom"
|
||||
x:Name="BoardToggleSwitchEnableTwoFingerZoom"
|
||||
Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"
|
||||
RenderTransformOrigin="0.5,0.5">
|
||||
<ui:ToggleSwitch.RenderTransform>
|
||||
@@ -5018,7 +5019,7 @@
|
||||
</Viewbox>
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel
|
||||
Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}"
|
||||
Opacity="{Binding Opacity, ElementName=TwoFingerGestureSimpleStackPanel}"
|
||||
Orientation="Horizontal" Spacing="4"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center">
|
||||
@@ -5032,7 +5033,7 @@
|
||||
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
IsOn="False" OnContent="" OffContent=""
|
||||
Name="BoardToggleSwitchEnableTwoFingerRotation"
|
||||
x:Name="BoardToggleSwitchEnableTwoFingerRotation"
|
||||
Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"
|
||||
RenderTransformOrigin="0.5,0.5">
|
||||
<ui:ToggleSwitch.RenderTransform>
|
||||
@@ -5052,6 +5053,7 @@
|
||||
</ui:SimpleStackPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
MouseUp="BoardChangeBackgroundColorBtn_MouseUp" CornerRadius="0,5,5,0"
|
||||
Background="{DynamicResource BoardFloatBarBackground}" Opacity="1" BorderThickness="0,1,1,1"
|
||||
@@ -5083,7 +5085,7 @@
|
||||
BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="SymbolIconSelect_MouseUp" CornerRadius="5,0,0,5"
|
||||
Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -5106,7 +5108,7 @@
|
||||
</Border>
|
||||
<Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="PenIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
MouseUp="PenIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image x:Name="BoardPenIcon" VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -5141,7 +5143,7 @@
|
||||
</Grid.RenderTransform>
|
||||
<Border x:Name="BoardPenPalette" Visibility="Visible"
|
||||
Background="{DynamicResource FloatBarBackground}"
|
||||
Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}"
|
||||
Opacity="1" BorderBrush="#2563eb"
|
||||
BorderThickness="1" CornerRadius="8">
|
||||
<ui:SimpleStackPanel Margin="0,-20,0,0">
|
||||
<Border BorderBrush="#1e3a8a" Height="32"
|
||||
@@ -6012,7 +6014,7 @@
|
||||
</Border>
|
||||
<Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="BoardEraserIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
MouseUp="BoardEraserIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -6234,7 +6236,7 @@
|
||||
MouseDown="Border_MouseDown"
|
||||
Visibility="Collapsed"
|
||||
MouseUp="BoardEraserIconByStrokes_Click" Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.85">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
Source="/Resources/Icons-png/eraser-line.png"
|
||||
@@ -6245,7 +6247,7 @@
|
||||
</Border>
|
||||
<Border x:Name="BoardGeometry" Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="ImageDrawShape_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
MouseUp="ImageDrawShape_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -6271,7 +6273,7 @@
|
||||
<Border Width="0">
|
||||
<Border x:Name="BoardBorderDrawShape" Visibility="Visible"
|
||||
Background="{DynamicResource FloatBarBackground}"
|
||||
Opacity="0.85" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="5"
|
||||
Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="5"
|
||||
Margin="-147,-286,-89,55">
|
||||
<Viewbox>
|
||||
<ui:SimpleStackPanel Spacing="-8" Orientation="Vertical">
|
||||
@@ -6418,7 +6420,7 @@
|
||||
</Border>
|
||||
<Border x:Name="BoardInsertImage" Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="InsertImageOptions_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
MouseUp="InsertImageOptions_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -6439,7 +6441,7 @@
|
||||
</Border>
|
||||
<Border>
|
||||
<!-- Image Insertion Options Panel -->
|
||||
<Grid RenderTransformOrigin="0,1" Margin="-133,-172,13,55">
|
||||
<Grid RenderTransformOrigin="0,1" Margin="-110,-92,13,55">
|
||||
<Grid.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1.5" ScaleY="1.5" />
|
||||
@@ -6448,12 +6450,12 @@
|
||||
<TranslateTransform />
|
||||
</TransformGroup>
|
||||
</Grid.RenderTransform>
|
||||
<Border Name="BoardImageOptionsPanel" Visibility="Collapsed" ClipToBounds="True" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderThickness="1" BorderBrush="#2563eb" Margin="0,76,0,0">
|
||||
<Border Name="BoardImageOptionsPanel" Visibility="Visible" ClipToBounds="True" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderThickness="1" BorderBrush="#2563eb">
|
||||
<ui:SimpleStackPanel Margin="0">
|
||||
<Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" Margin="-1,-1,-1,1" CornerRadius="6,6,0,0" Background="#2563eb">
|
||||
<Canvas Height="24" ClipToBounds="True">
|
||||
<TextBlock Text="选择图片" Foreground="White" Padding="0,5" FontSize="11" FontWeight="Bold" Canvas.Left="8" TextAlignment="Center" />
|
||||
<Image Margin="100,4,0,0" Source="/Resources/new-icons/close-white.png" RenderOptions.BitmapScalingMode="HighQuality" Height="12" Width="12" MouseDown="Border_MouseDown" MouseUp="CloseImageOptionsPanel_MouseUp" />
|
||||
<Image Margin="77,4,0,0" Source="/Resources/new-icons/close-white.png" RenderOptions.BitmapScalingMode="HighQuality" Height="16" Width="16" MouseDown="Border_MouseDown" MouseUp="CloseImageOptionsPanel_MouseUp" />
|
||||
</Canvas>
|
||||
</Border>
|
||||
<ui:SimpleStackPanel Margin="6,4,6,4" Spacing="2">
|
||||
@@ -6522,7 +6524,7 @@
|
||||
</Border>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border x:Name="BoardUndo" Width="60" Height="50" MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
<Border x:Name="BoardUndo" Width="60" Height="50" MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}">
|
||||
@@ -6540,7 +6542,7 @@
|
||||
<TextBlock Text="撤销" Foreground="{DynamicResource FloatBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="12" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border x:Name="BoardRedo" Width="60" Height="50" CornerRadius="0,5,5,0" MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
<Border x:Name="BoardRedo" Width="60" Height="50" CornerRadius="0,5,5,0" MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}">
|
||||
<Image.Source>
|
||||
@@ -6564,7 +6566,7 @@
|
||||
<Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}">
|
||||
<ui:SimpleStackPanel Orientation="Horizontal">
|
||||
<Border Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconTools_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95"
|
||||
MouseUp="SymbolIconTools_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1"
|
||||
BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
CornerRadius="5,0,0,5">
|
||||
<Grid Margin="6,6,6,4">
|
||||
@@ -6817,7 +6819,7 @@
|
||||
</Border>
|
||||
<Border Width="60" Height="50" MouseDown="Border_MouseDown"
|
||||
MouseUp="ImageBlackboard_MouseUp"
|
||||
CornerRadius="0,5,5,0" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95"
|
||||
CornerRadius="0,5,5,0" Background="{DynamicResource BoardFloatBarBackground}" Opacity="1"
|
||||
BorderThickness="0,1,1,1"
|
||||
BorderBrush="{DynamicResource BoardFloatBarBorderBrush}">
|
||||
<Grid Margin="6,6,6,4">
|
||||
@@ -6853,7 +6855,7 @@
|
||||
<Border Width="60" Height="50"
|
||||
BorderThickness="1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -6879,7 +6881,7 @@
|
||||
BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
|
||||
Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
@@ -6903,7 +6905,7 @@
|
||||
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
|
||||
Name="BtnRightPageListWB"
|
||||
BorderThickness="1,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" Background="{DynamicResource BoardFloatBarBackground}"
|
||||
Opacity="0.95">
|
||||
Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<TextBlock HorizontalAlignment="Center"
|
||||
Text="{Binding ElementName=TextBlockWhiteBoardIndexInfo, Path=Text}"
|
||||
@@ -6969,7 +6971,7 @@
|
||||
IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
|
||||
CornerRadius="0,5,5,0"
|
||||
BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
|
||||
Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
|
||||
Background="{DynamicResource BoardFloatBarBackground}" Opacity="1">
|
||||
<Grid Margin="6,6,6,4">
|
||||
<Image VerticalAlignment="Top"
|
||||
RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
|
||||
|
||||
@@ -2957,6 +2957,12 @@ namespace Ink_Canvas
|
||||
{
|
||||
try
|
||||
{
|
||||
// 如果切换到非橡皮擦模式，禁用橡皮擦覆盖层并重置橡皮擦状态
|
||||
if (newMode != InkCanvasEditingMode.EraseByPoint && newMode != InkCanvasEditingMode.EraseByStroke)
|
||||
{
|
||||
DisableEraserOverlay();
|
||||
}
|
||||
|
||||
// 执行模式切换
|
||||
inkCanvas.EditingMode = newMode;
|
||||
|
||||
|
||||
@@ -40,31 +40,12 @@ namespace Ink_Canvas
|
||||
{
|
||||
if (TwoFingerGestureBorder.Visibility == Visibility.Visible)
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
}
|
||||
else
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
HideSubPanels();
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardTwoFingerGestureBorder);
|
||||
}
|
||||
@@ -285,9 +266,16 @@ namespace Ink_Canvas
|
||||
BoardBorderLeftPageListView.Visibility = Visibility.Collapsed;
|
||||
BoardBorderRightPageListView.Visibility = Visibility.Collapsed;
|
||||
BoardImageOptionsPanel.Visibility = Visibility.Collapsed;
|
||||
TwoFingerGestureBorder.Visibility = Visibility.Collapsed;
|
||||
BoardTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
|
||||
// 添加隐藏图形工具的二级菜单面板
|
||||
BorderDrawShape.Visibility = Visibility.Collapsed;
|
||||
BoardBorderDrawShape.Visibility = Visibility.Collapsed;
|
||||
|
||||
if (LogicalTreeHelper.FindLogicalNode(this, "BackgroundPalette") is Border bgPalette)
|
||||
{
|
||||
bgPalette.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -361,6 +349,8 @@ namespace Ink_Canvas
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
|
||||
// 隐藏背景设置面板
|
||||
if (LogicalTreeHelper.FindLogicalNode(this, "BackgroundPalette") is Border bgPalette)
|
||||
@@ -1567,33 +1557,12 @@ namespace Ink_Canvas
|
||||
|
||||
if (BorderTools.Visibility == Visibility.Visible)
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
HideSubPanels();
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderTools);
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools);
|
||||
}
|
||||
@@ -2257,33 +2226,12 @@ namespace Ink_Canvas
|
||||
|
||||
if (PenPalette.Visibility == Visibility.Visible)
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
HideSubPanels();
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette);
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
|
||||
}
|
||||
@@ -3127,7 +3075,9 @@ namespace Ink_Canvas
|
||||
ViewboxFloatingBar.Visibility = Visibility.Visible;
|
||||
|
||||
// 退出白板时自动收纳功能 - 等待浮动栏完全展开后再收纳
|
||||
if (Settings.Automation.IsAutoFoldWhenExitWhiteboard && !isFloatingBarFolded)
|
||||
// 当处于PPT放映模式时，不自动收纳
|
||||
if (Settings.Automation.IsAutoFoldWhenExitWhiteboard && !isFloatingBarFolded &&
|
||||
BtnPPTSlideShowEnd.Visibility != Visibility.Visible)
|
||||
{
|
||||
// 使用异步延迟，等待浮动栏展开动画完成后再收纳
|
||||
Task.Run(async () =>
|
||||
@@ -3416,7 +3366,7 @@ namespace Ink_Canvas
|
||||
else
|
||||
{
|
||||
// Panel was hidden, so hide other panels and show this one
|
||||
HideSubPanelsImmediately();
|
||||
HideSubPanels();
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardImageOptionsPanel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,32 +30,12 @@ namespace Ink_Canvas
|
||||
// FloatingBarIcons_MouseUp_New(sender);
|
||||
if (BorderDrawShape.Visibility == Visibility.Visible)
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
}
|
||||
else
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
|
||||
HideSubPanels();
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderDrawShape);
|
||||
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderDrawShape);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user