kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

[fix] 修复Merge ICA仓库代码后导致浮动工具栏批注按钮UI MouseLeave反馈的问题

Browse Source
This commit is contained in:
Dubi906w 2024-05-05 10:11:03 +08:00
parent ac5f4b3a00
commit 9ee468852c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ink Canvas/MainWindow.xaml
View File

@ -94,7 +94,7 @@
<TextBlock Text="{Binding nowTime}" Name="WaterMarkTime" Visibility="Collapsed" FontSize="30" FontWeight="Bold" Foreground="White" Opacity="0.6"/>
<TextBlock Text="{Binding nowDate}" Name="WaterMarkDate" Visibility="Collapsed" Margin="2,0,0,0" FontSize="16" Foreground="White" Opacity="0.45"/>
</ui:SimpleStackPanel>
<TextBlock Canvas.Right="25" Canvas.Top="15" Text="Helloworld" Name="BlackBoardWaterMark" Visibility="Collapsed" FontSize="30" FontWeight="Bold" Foreground="White" Opacity="0.5"/>
<TextBlock Canvas.Right="25" Canvas.Top="15" Text="InkCanvasForClass测试版" Name="BlackBoardWaterMark" Visibility="Collapsed" FontSize="30" FontWeight="Bold" Foreground="White" Opacity="0.5"/>
</Canvas>
<Canvas Name="Canvas"/>
<Label Name="Label" Visibility="Collapsed" Foreground="Gray" Content="0"/>

13
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
View File

@ -669,7 +669,8 @@ namespace Ink_Canvas {
if (ssp != null)
{
ssp.Background = Brushes.Transparent;
if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink){
if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink && inkCanvas.IsHitTestVisible==true)
{
Pen_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
} else if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint)
{
@ -1466,10 +1467,16 @@ namespace Ink_Canvas {
if (changeColorTheme) {
if (currentMode != 0) {
if (Settings.Canvas.UsingWhiteboard) {
GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FFF2F2F2"));
GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(234,235,237));
WaterMarkTime.Foreground= new SolidColorBrush(Color.FromRgb(22, 41, 36));
WaterMarkDate.Foreground= new SolidColorBrush(Color.FromRgb(22, 41, 36));
BlackBoardWaterMark.Foreground = new SolidColorBrush(Color.FromRgb(22, 41, 36));
isUselightThemeColor = false;
} else {
GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FF1F1F1F"));
GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(22,41,36));
WaterMarkTime.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
WaterMarkDate.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
BlackBoardWaterMark.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
isUselightThemeColor = true;
}
}