feat(浮动工具栏): 添加退出按钮并优化UI样式
- 在浮动工具栏中添加退出按钮的本地化文本 - 移除未使用的BoardMenuFrame相关动画代码 - 调整浮动工具栏中元素的边距和圆角样式 - 将退出按钮文本改为使用i18n资源
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
using Ink_Canvas.Controls;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
@@ -10,11 +9,6 @@ namespace Ink_Canvas.Helpers
|
|||||||
{
|
{
|
||||||
private static UIElement ResolveAnimationTarget(UIElement element)
|
private static UIElement ResolveAnimationTarget(UIElement element)
|
||||||
{
|
{
|
||||||
if (element is BoardMenuFrame frame)
|
|
||||||
{
|
|
||||||
frame.ApplyTemplate();
|
|
||||||
return frame.AnimationTarget ?? element;
|
|
||||||
}
|
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2460,7 +2460,7 @@
|
|||||||
<Image Margin="0"
|
<Image Margin="0"
|
||||||
Name="FloatingbarHeadIconImg"
|
Name="FloatingbarHeadIconImg"
|
||||||
SnapsToDevicePixels="True"
|
SnapsToDevicePixels="True"
|
||||||
RenderOptions.BitmapScalingMode="Fant"
|
RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
Source="/Resources/Icons-png/icc.png" />
|
Source="/Resources/Icons-png/icc.png" />
|
||||||
</ikw:SimpleStackPanel>
|
</ikw:SimpleStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -3116,7 +3116,7 @@
|
|||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<ikw:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
|
<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}"
|
Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}"
|
||||||
BorderThickness="1">
|
BorderThickness="1">
|
||||||
<ikw:SimpleStackPanel
|
<ikw:SimpleStackPanel
|
||||||
@@ -3261,9 +3261,9 @@
|
|||||||
</Canvas>
|
</Canvas>
|
||||||
</ikw:SimpleStackPanel>
|
</ikw:SimpleStackPanel>
|
||||||
<!--Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">-->
|
<!--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"
|
MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp"
|
||||||
Background="{DynamicResource FloatBarBackground}" CornerRadius="4" BorderThickness="1"
|
Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1"
|
||||||
BorderBrush="{DynamicResource FloatBarBorderBrush}"
|
BorderBrush="{DynamicResource FloatBarBorderBrush}"
|
||||||
Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">
|
Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">
|
||||||
<ikw:SimpleStackPanel Background="Transparent" Orientation="Vertical"
|
<ikw:SimpleStackPanel Background="Transparent" Orientation="Vertical"
|
||||||
@@ -3272,7 +3272,7 @@
|
|||||||
<Image Source="{DynamicResource QuickPanelEndSlideshowIcon}"
|
<Image Source="{DynamicResource QuickPanelEndSlideshowIcon}"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
|
RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
|
||||||
Margin="0,3,0,0" />
|
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" />
|
TextAlignment="Center" />
|
||||||
</ikw:SimpleStackPanel>
|
</ikw:SimpleStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -2175,6 +2175,9 @@ Hide</value>
|
|||||||
<data name="FloatingBar_GestureButton" xml:space="preserve">
|
<data name="FloatingBar_GestureButton" xml:space="preserve">
|
||||||
<value>Gesture</value>
|
<value>Gesture</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="FloatingBar_ExitButton" xml:space="preserve">
|
||||||
|
<value>Exit</value>
|
||||||
|
</data>
|
||||||
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
|
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
|
||||||
<value>Gesture options</value>
|
<value>Gesture options</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -2218,6 +2218,9 @@
|
|||||||
<data name="FloatingBar_GestureButton" xml:space="preserve">
|
<data name="FloatingBar_GestureButton" xml:space="preserve">
|
||||||
<value>手势</value>
|
<value>手势</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="FloatingBar_ExitButton" xml:space="preserve">
|
||||||
|
<value>退出</value>
|
||||||
|
</data>
|
||||||
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
|
<data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
|
||||||
<value>手势选项</value>
|
<value>手势选项</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
Reference in New Issue
Block a user