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

add:板刷模式

Browse Source
This commit is contained in:
CJKmkp
2026-02-14 13:47:44 +08:00
parent a95effabdd
commit 27a9f965a9
2 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml
+6 -9
View File
@@ -8443,7 +8443,7 @@
FontSize="17" VerticalAlignment="Center" /> FontSize="17" VerticalAlignment="Center" />
<Slider x:Name="InkWidthSlider" Minimum="1" <Slider x:Name="InkWidthSlider" Minimum="1"
Maximum="20" Maximum="20"
Width="180" FontFamily="Microsoft YaHei UI" Width="200" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" FontSize="20" IsSnapToTickEnabled="True"
Value="5" Value="5"
TickFrequency="0.1" TickPlacement="None" TickFrequency="0.1" TickPlacement="None"
@@ -8452,13 +8452,10 @@
Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
FontFamily="Consolas" VerticalAlignment="Bottom" FontFamily="Consolas" VerticalAlignment="Bottom"
Margin="10,0,0,4.5" FontSize="15" /> Margin="10,0,0,4.5" FontSize="15" />
<Border x:Name="BoardBrushModeButton" Width="24" Height="24" Margin="8,0,0,0" <Button x:Name="BoardBrushModeButton" Width="24" Height="24" Margin="8,0,0,0"
Background="{DynamicResource FloatBarBackground}" Style="{StaticResource NavButton}"
BorderBrush="{DynamicResource FloatBarBorderBrush}"
BorderThickness="1" CornerRadius="2"
VerticalAlignment="Center" VerticalAlignment="Center"
MouseDown="Border_MouseDown" Click="BoardBrushModeButton_Click"
MouseUp="BoardBrushModeButton_MouseUp"
ToolTip="板刷模式"> ToolTip="板刷模式">
<Viewbox Margin="4" Stretch="Uniform"> <Viewbox Margin="4" Stretch="Uniform">
<Path x:Name="BoardBrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill"> <Path x:Name="BoardBrushModeIcon" Fill="{DynamicResource FloatBarForeground}" Stretch="Fill">
@@ -8467,14 +8464,14 @@
</Path.Data> </Path.Data>
</Path> </Path>
</Viewbox> </Viewbox>
</Border> </Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Height="30"> <StackPanel Orientation="Horizontal" Height="30">
<Label Margin="0,0,10,0" Content="透明" FontWeight="Bold" <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold"
Foreground="{DynamicResource FloatBarForeground}" Foreground="{DynamicResource FloatBarForeground}"
FontSize="17" VerticalAlignment="Center" /> FontSize="17" VerticalAlignment="Center" />
<Slider x:Name="InkAlphaSlider" Margin="0,0,0,0" <Slider x:Name="InkAlphaSlider" Margin="0,0,0,0"
Minimum="1" Maximum="255" Width="180" Minimum="1" Maximum="255" Width="200"
FontFamily="Microsoft YaHei UI" FontSize="20" FontFamily="Microsoft YaHei UI" FontSize="20"
IsSnapToTickEnabled="True" Value="255" IsSnapToTickEnabled="True" Value="255"
TickFrequency="1" TickFrequency="1"
Ink Canvas/MainWindow.xaml.cs
+51
View File
@@ -572,6 +572,57 @@ namespace Ink_Canvas
private const double BoardBrushInkWidth = 300; private const double BoardBrushInkWidth = 300;
private void BoardBrushModeButton_Click(object sender, RoutedEventArgs e)
{
_isBoardBrushMode = !_isBoardBrushMode;
try
{
if (drawingAttributes == null)
drawingAttributes = inkCanvas.DefaultDrawingAttributes;
if (penType == 1) return;
if (_isBoardBrushMode)
{
_savedInkWidthBeforeBoardBrush = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : drawingAttributes.Width;
if (_savedInkWidthBeforeBoardBrush < 0.5) _savedInkWidthBeforeBoardBrush = 2.5;
drawingAttributes.Width = BoardBrushInkWidth;
drawingAttributes.Height = BoardBrushInkWidth;
inkCanvas.DefaultDrawingAttributes.Width = BoardBrushInkWidth;
inkCanvas.DefaultDrawingAttributes.Height = BoardBrushInkWidth;
drawingAttributes.IgnorePressure = true;
inkCanvas.DefaultDrawingAttributes.IgnorePressure = true;
if (BoardBrushModeButton != null)
BoardBrushModeButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
}
else
{
double w = InkWidthSlider != null ? InkWidthSlider.Value / 2.0 : _savedInkWidthBeforeBoardBrush;
if (w < 0.5) w = 2.5;
drawingAttributes.Width = w;
drawingAttributes.Height = w;
inkCanvas.DefaultDrawingAttributes.Width = w;
inkCanvas.DefaultDrawingAttributes.Height = w;
drawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
if (BoardInkWidthSlider != null) BoardInkWidthSlider.Value = w * 2;
if (Settings?.Canvas != null) Settings.Canvas.InkWidth = w;
if (BoardBrushModeButton != null)
BoardBrushModeButton.ClearValue(BackgroundProperty);
}
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"BoardBrushModeButton_Click: {ex.Message}", LogHelper.LogType.Error);
}
}
private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e) private void BoardBrushModeButton_MouseUp(object sender, MouseButtonEventArgs e)
{ {
if (sender != BoardBrushModeButton) return; if (sender != BoardBrushModeButton) return;