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

Fix and add dark light mode change for strokes

Browse Source
This commit is contained in:
XY Wang 2021-10-09 12:50:02 +08:00
parent 4fda4f03e4
commit 4399a6a824
3 changed files with 87 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ink Canvas/ChangeLogWindow.xaml.cs
View File

@ -46,9 +46,9 @@ namespace Ink_Canvas
//Version 2.1.2-release
TextBlockChangeLog.Text = "" +
"1. 修复由缩放导致的崩溃\n" +
"2. 优化选中墨迹后的缩放\n" +
"3. 修复部分情况下无法书写的问题（未测试）";
"1. 支持多页白板/黑板\n" +
"2. \n" +
"3. ";
TextBlockSuggestion.Text = "老师讲评试卷可以点击右侧的背景和深色按钮，即可启动黑板功能（同样支持用笔来擦除），\n双指可以缩放和拖动，左边也会有工具栏方便画图形。";
Version version = Assembly.GetExecutingAssembly().GetName().Version;

41
Ink Canvas/MainWindow.xaml
View File

@ -62,6 +62,7 @@
TouchUp="GridInkCanvasSelectionCover_TouchUp"
Background="#01FFFFFF" Opacity="0.01" Visibility="Collapsed"/>
<Grid Visibility="{Binding ElementName=GridBackgroundCoverHolder, Path=Visibility}">
<ui:SimpleStackPanel Spacing="10" Orientation="Horizontal"
VerticalAlignment="Bottom"
HorizontalAlignment="Center"
@ -74,7 +75,10 @@
VerticalContentAlignment="Top"
IsEnabled="False"/>
<Border Height="48" CornerRadius="2" Margin="3,0">
<TextBlock Name="TextBlockWhiteBoardIndexInfo" Text="1 / 1" VerticalAlignment="Center" HorizontalAlignment="Center" FontFamily="Microsoft YaHei UI" FontSize="18"/>
<TextBlock Name="TextBlockWhiteBoardIndexInfo"
Text="1 / 1"
Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
VerticalAlignment="Center" HorizontalAlignment="Center" FontFamily="Microsoft YaHei UI" FontSize="18"/>
</Border>
<Button Name="BtnWhiteBoardSwitchNext" Content="&gt;" FontFamily="Symbol"
Width="50" Height="48" FontSize="25" Click="BtnWhiteBoardSwitchNext_Click"
@ -96,6 +100,7 @@
<ui:SymbolIcon Symbol="Delete" />
</Button>
</ui:SimpleStackPanel>
</Grid>
<Border Name="BorderSettings" Background="White" BorderBrush="Black"
BorderThickness="1" CornerRadius="10"
@ -342,7 +347,7 @@
</StackPanel>
</Viewbox>
<StackPanel Name="StackPanelShapes" Margin="{Binding ElementName=ViewBoxStackPanelMain, Path=Margin}" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="46" Visibility="{Binding ElementName=inkCanvas, Path=Visibility}">
<Slider HorizontalAlignment="Center"
<Slider HorizontalAlignment="Center" Visibility="Collapsed"
Minimum="1" Maximum="20" Orientation="Vertical"
Height="330" FontFamily="Microsoft YaHei UI"
ui:ControlHelper.Header="画笔&#x000A;粗细"
@ -351,8 +356,36 @@
RenderTransformOrigin="0.5,0.5"
Value="{Binding ElementName=InkWidthSlider, Path=Value, Mode=TwoWay}">
</Slider>
<TextBlock Visibility="Collapsed" Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
FontSize="14"/>
<TextBlock Text="画笔&#x000A;粗细"
FontSize="14" HorizontalAlignment="Center"/>
<Button Name="BtnPenWidthIncrease" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,5" Height="{Binding ElementName=BtnPen, Path=ActualHeight}" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPenWidthIncrease_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
Background="{Binding ElementName=BtnExit, Path=Background}">
<!--<ui:SymbolIcon Symbol="Add"/>-->
<Grid Margin="0,3,-5,0">
<TextBlock Text="&lt;" FontFamily="Symbol" FontSize="22" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock.LayoutTransform>
<RotateTransform Angle="90"/>
</TextBlock.LayoutTransform>
</TextBlock>
</Grid>
</Button>
<TextBlock Visibility="Visible" Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
FontSize="14" HorizontalAlignment="Center"/>
<Button Name="BtnPenWidthDecrease" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,5,0,0" Height="{Binding ElementName=BtnPen, Path=ActualHeight}" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPenWidthDecrease_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
Background="{Binding ElementName=BtnExit, Path=Background}">
<!--<ui:SymbolIcon Symbol="Remove"/>-->
<Grid Margin="0,4,-5,0">
<TextBlock Text="&gt;" FontFamily="Symbol" FontSize="22" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock.LayoutTransform>
<RotateTransform Angle="90"/>
</TextBlock.LayoutTransform>
</TextBlock>
</Grid>
</Button>
<Button Name="BtnPen" Content="笔" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,25,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPen_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>

34
Ink Canvas/MainWindow.xaml.cs
View File

@ -782,6 +782,14 @@ namespace Ink_Canvas
{
inkCanvas.DefaultDrawingAttributes.Color = Colors.White;
}
foreach (Stroke stroke in inkCanvas.Strokes)
{
if (stroke.DrawingAttributes.Color == Colors.Black)
{
stroke.DrawingAttributes.Color = Colors.White;
}
}
}
else
{
@ -798,6 +806,14 @@ namespace Ink_Canvas
{
inkCanvas.DefaultDrawingAttributes.Color = Colors.Black;
}
foreach (Stroke stroke in inkCanvas.Strokes)
{
if (stroke.DrawingAttributes.Color == Colors.White)
{
stroke.DrawingAttributes.Color = Colors.Black;
}
}
}
if (!Settings.Appearance.IsTransparentButtonBackground)
{
@ -2068,6 +2084,24 @@ namespace Ink_Canvas
}
#endregion Whiteboard Controls
private void BtnPenWidthDecrease_Click(object sender, RoutedEventArgs e)
{
try
{
InkWidthSlider.Value -= 1;
}
catch { }
}
private void BtnPenWidthIncrease_Click(object sender, RoutedEventArgs e)
{
try
{
InkWidthSlider.Value += 1;
}
catch { }
}
}
enum HotkeyModifiers