fix:issue #93
This commit is contained in:
@@ -774,6 +774,12 @@
|
|||||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
Toggled="ToggleSwitchClearCanvasAndClearTimeMachine_Toggled" />
|
Toggled="ToggleSwitchClearCanvasAndClearTimeMachine_Toggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="清空画布时同时清空图片" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchClearCanvasAlsoClearImages"
|
||||||
|
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
|
Toggled="ToggleSwitchClearCanvasAlsoClearImages_Toggled" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<TextBlock Foreground="#fafafa" Text="插入图片时自动压缩(大于1920x1080)" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
<TextBlock Foreground="#fafafa" Text="插入图片时自动压缩(大于1920x1080)" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||||
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchCompressPicturesUploaded"
|
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchCompressPicturesUploaded"
|
||||||
|
|||||||
@@ -716,12 +716,44 @@ namespace Ink_Canvas {
|
|||||||
private void BoardSymbolIconDelete_MouseUp(object sender, RoutedEventArgs e) {
|
private void BoardSymbolIconDelete_MouseUp(object sender, RoutedEventArgs e) {
|
||||||
PenIcon_Click(null, null);
|
PenIcon_Click(null, null);
|
||||||
SymbolIconDelete_MouseUp(null, null);
|
SymbolIconDelete_MouseUp(null, null);
|
||||||
|
|
||||||
|
// 根据设置决定是否清空图片
|
||||||
|
if (Settings.Canvas.ClearCanvasAlsoClearImages) {
|
||||||
|
// 如果设置为清空图片,则直接清空所有子元素
|
||||||
|
System.Diagnostics.Debug.WriteLine("BoardSymbolIconDelete: Clearing all children including images");
|
||||||
|
inkCanvas.Children.Clear();
|
||||||
|
} else {
|
||||||
|
// 保存非笔画元素(如图片)
|
||||||
|
System.Diagnostics.Debug.WriteLine("BoardSymbolIconDelete: Preserving non-stroke elements (images)");
|
||||||
|
var preservedElements = PreserveNonStrokeElements();
|
||||||
|
System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDelete: Preserved elements count: {preservedElements.Count}");
|
||||||
|
inkCanvas.Children.Clear();
|
||||||
|
// 恢复非笔画元素
|
||||||
|
RestoreNonStrokeElements(preservedElements);
|
||||||
|
System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDelete: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
private void BoardSymbolIconDeleteInkAndHistories_MouseUp(object sender, RoutedEventArgs e)
|
private void BoardSymbolIconDeleteInkAndHistories_MouseUp(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
PenIcon_Click(null, null);
|
PenIcon_Click(null, null);
|
||||||
SymbolIconDelete_MouseUp(null, null);
|
SymbolIconDelete_MouseUp(null, null);
|
||||||
if (Settings.Canvas.ClearCanvasAndClearTimeMachine == false) timeMachine.ClearStrokeHistory();
|
if (Settings.Canvas.ClearCanvasAndClearTimeMachine == false) timeMachine.ClearStrokeHistory();
|
||||||
|
|
||||||
|
// 根据设置决定是否清空图片
|
||||||
|
if (Settings.Canvas.ClearCanvasAlsoClearImages) {
|
||||||
|
// 如果设置为清空图片,则直接清空所有子元素
|
||||||
|
System.Diagnostics.Debug.WriteLine("BoardSymbolIconDeleteInkAndHistories: Clearing all children including images");
|
||||||
|
inkCanvas.Children.Clear();
|
||||||
|
} else {
|
||||||
|
// 保存非笔画元素(如图片)
|
||||||
|
System.Diagnostics.Debug.WriteLine("BoardSymbolIconDeleteInkAndHistories: Preserving non-stroke elements (images)");
|
||||||
|
var preservedElements = PreserveNonStrokeElements();
|
||||||
|
System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDeleteInkAndHistories: Preserved elements count: {preservedElements.Count}");
|
||||||
|
inkCanvas.Children.Clear();
|
||||||
|
// 恢复非笔画元素
|
||||||
|
RestoreNonStrokeElements(preservedElements);
|
||||||
|
System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDeleteInkAndHistories: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e) {
|
private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||||
|
|||||||
@@ -2221,6 +2221,13 @@ namespace Ink_Canvas {
|
|||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ToggleSwitchClearCanvasAlsoClearImages_Toggled(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (!isLoaded) return;
|
||||||
|
Settings.Canvas.ClearCanvasAlsoClearImages = ToggleSwitchClearCanvasAlsoClearImages.IsOn;
|
||||||
|
SaveSettingsToFile();
|
||||||
|
}
|
||||||
|
|
||||||
private void ToggleSwitchCompressPicturesUploaded_Toggled(object sender, RoutedEventArgs e)
|
private void ToggleSwitchCompressPicturesUploaded_Toggled(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
|
|||||||
@@ -466,6 +466,7 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
ToggleSwitchClearCanvasAndClearTimeMachine.IsOn =
|
ToggleSwitchClearCanvasAndClearTimeMachine.IsOn =
|
||||||
Settings.Canvas.ClearCanvasAndClearTimeMachine == true;
|
Settings.Canvas.ClearCanvasAndClearTimeMachine == true;
|
||||||
|
ToggleSwitchClearCanvasAlsoClearImages.IsOn = Settings.Canvas.ClearCanvasAlsoClearImages;
|
||||||
|
|
||||||
switch (Settings.Canvas.EraserShapeType) {
|
switch (Settings.Canvas.EraserShapeType) {
|
||||||
case 0: {
|
case 0: {
|
||||||
|
|||||||
@@ -87,6 +87,8 @@ namespace Ink_Canvas
|
|||||||
public bool IsCompressPicturesUploaded { get; set; } = false;
|
public bool IsCompressPicturesUploaded { get; set; } = false;
|
||||||
[JsonProperty("enablePalmEraser")]
|
[JsonProperty("enablePalmEraser")]
|
||||||
public bool EnablePalmEraser { get; set; } = true;
|
public bool EnablePalmEraser { get; set; } = true;
|
||||||
|
[JsonProperty("clearCanvasAlsoClearImages")]
|
||||||
|
public bool ClearCanvasAlsoClearImages { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum OptionalOperation
|
public enum OptionalOperation
|
||||||
|
|||||||
Reference in New Issue
Block a user