CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'net6' of https://github.com/InkCanvasForClass/community into net6

Browse Source
This commit is contained in:
CJKmkp
2026-05-02 01:03:13 +08:00
parent a18d476415 1fe66790e6
commit c8848f6cde
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/AnimationsHelper.cs
+4 -1
View File
@@ -7,7 +7,10 @@ namespace Ink_Canvas.Helpers
{
internal class AnimationsHelper
{
private static UIElement ResolveAnimationTarget(UIElement element) => element;
private static UIElement ResolveAnimationTarget(UIElement element)
{
return element;
}
public static void ShowWithFadeIn(UIElement element, double duration = 0.15)
{
Ink Canvas/MainWindow.xaml
+5 -5
View File
@@ -2460,7 +2460,7 @@
<Image Margin="0"
Name="FloatingbarHeadIconImg"
SnapsToDevicePixels="True"
RenderOptions.BitmapScalingMode="Fant"
RenderOptions.BitmapScalingMode="HighQuality"
Source="/Resources/Icons-png/icc.png" />
</ikw:SimpleStackPanel>
</Border>
@@ -3116,7 +3116,7 @@
</Border>
<ikw:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<Border Margin=" 4,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
<Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}"
BorderThickness="1">
<ikw:SimpleStackPanel
@@ -3261,9 +3261,9 @@
</Canvas>
</ikw:SimpleStackPanel>
<!--Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">-->
<Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="34" Height="36"
<Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="36" Height="36"
MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp"
Background="{DynamicResource FloatBarBackground}" CornerRadius="4" BorderThickness="1"
Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1"
BorderBrush="{DynamicResource FloatBarBorderBrush}"
Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">
<ikw:SimpleStackPanel Background="Transparent" Orientation="Vertical"
@@ -3272,7 +3272,7 @@
<Image Source="{DynamicResource QuickPanelEndSlideshowIcon}"
RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
Margin="0,3,0,0" />
<TextBlock Text="退出" Foreground="{DynamicResource FloatBarForeground}" FontSize="8" Margin="0,1,0,0"
<TextBlock Text="{i18n:I18n Key=FloatingBar_ExitButton}" Foreground="{DynamicResource FloatBarForeground}" FontSize="8" Margin="0,1,0,0"
TextAlignment="Center" />
</ikw:SimpleStackPanel>
</Border>
Ink Canvas/Properties/Strings.en-US.resx
+3
View File
@@ -2175,6 +2175,9 @@ Hide</value>
<data name="FloatingBar_GestureButton" xml:space="preserve">
<value>Gesture</value>
</data>
<data name="FloatingBar_ExitButton" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
<value>Gesture options</value>
</data>
Ink Canvas/Properties/Strings.resx
+3
View File
@@ -2218,6 +2218,9 @@
<data name="FloatingBar_GestureButton" xml:space="preserve">
<value>手势</value>
</data>
<data name="FloatingBar_ExitButton" xml:space="preserve">
<value>退出</value>
</data>
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
<value>手势选项</value>
</data>