From f7004d05659004f3790493a71058a69c6fb4f6ef Mon Sep 17 00:00:00 2001 From: kriastans Date: Fri, 9 Aug 2024 21:34:02 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=99=BD=E6=9D=BF=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=E6=B5=AE=E5=8A=A8=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE=EF=BC=9B=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InkCanvasForClass/App.xaml.cs | 2 +- InkCanvasForClass/MainWindow.xaml | 138 +++++------------ InkCanvasForClass/MainWindow.xaml.cs | 3 +- .../MainWindow_cs/MW_BoardControls.cs | 140 +++++++++--------- .../MainWindow_cs/MW_FloatingBarIcons.cs | 80 +++++++++- .../MainWindow_cs/MW_Settings.cs | 31 ++++ .../MainWindow_cs/MW_SettingsToLoad.cs | 3 + InkCanvasForClass/MainWindow_cs/MW_Storage.cs | 2 +- InkCanvasForClass/Resources/Settings.cs | 8 +- 9 files changed, 231 insertions(+), 176 deletions(-) diff --git a/InkCanvasForClass/App.xaml.cs b/InkCanvasForClass/App.xaml.cs index 415e92d..7367823 100644 --- a/InkCanvasForClass/App.xaml.cs +++ b/InkCanvasForClass/App.xaml.cs @@ -101,7 +101,7 @@ namespace Ink_Canvas mainWin = new MainWindow(); - if (isUsingWindowChrome) { + if (isUsingWindowChrome && DwmCompositionHelper.DwmIsCompositionEnabled()) { mainWin.AllowsTransparency = false; WindowChrome wc = new WindowChrome(); wc.GlassFrameThickness = new Thickness(-1); diff --git a/InkCanvasForClass/MainWindow.xaml b/InkCanvasForClass/MainWindow.xaml index 5e3631e..4c836b1 100644 --- a/InkCanvasForClass/MainWindow.xaml +++ b/InkCanvasForClass/MainWindow.xaml @@ -504,7 +504,7 @@ - - @@ -620,7 +618,7 @@ - @@ -631,7 +629,7 @@ - @@ -639,7 +637,7 @@ + HorizontalAlignment="Center" FontSize="12" Name="BtnWhiteboardAddTextBlockLeft"/> @@ -2761,7 +2759,7 @@ - @@ -2772,7 +2770,7 @@ - @@ -2780,13 +2778,12 @@ + HorizontalAlignment="Center" FontSize="12" Name="BtnWhiteboardAddTextBlockRight" /> - @@ -2904,92 +2901,6 @@ - - - - - - - - - - @@ -6741,6 +6652,31 @@ + + + + + + + + + + + + + + + diff --git a/InkCanvasForClass/MainWindow.xaml.cs b/InkCanvasForClass/MainWindow.xaml.cs index 8feeaa1..5c4ab9d 100644 --- a/InkCanvasForClass/MainWindow.xaml.cs +++ b/InkCanvasForClass/MainWindow.xaml.cs @@ -239,7 +239,6 @@ namespace Ink_Canvas { new SolidColorBrush(System.Windows.Media.Color.FromArgb(127, 24, 24, 27)); BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5; - BtnWhiteBoardSwitchPrevious.IsEnabled = CurrentWhiteboardIndex != 1; BorderInkReplayToolBox.Visibility = Visibility.Collapsed; BoardBackgroundPopup.Visibility = Visibility.Collapsed; @@ -269,6 +268,8 @@ namespace Ink_Canvas { InitFreezeWindow(new HWND[] { new HWND(new WindowInteropHelper(this).Handle) }); + + UpdateIndexInfoDisplay(); } private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) { diff --git a/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs b/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs index 377e923..d7b2254 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs @@ -189,8 +189,6 @@ namespace Ink_Canvas { } private void BtnWhiteBoardSwitchNext_Click(object sender, EventArgs e) { - Trace.WriteLine("113223234"); - if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenshot(true); if (CurrentWhiteboardIndex >= WhiteboardTotalCount) { @@ -230,7 +228,7 @@ namespace Ink_Canvas { UpdateIndexInfoDisplay(); - if (WhiteboardTotalCount >= 99) BtnWhiteBoardAdd.IsEnabled = false; + //if (WhiteboardTotalCount >= 99) BtnWhiteBoardAdd.IsEnabled = false; if (BlackBoardLeftSidePageListView.Visibility == Visibility.Visible) { RefreshBlackBoardSidePageListView(); @@ -254,74 +252,84 @@ namespace Ink_Canvas { UpdateIndexInfoDisplay(); - if (WhiteboardTotalCount < 99) BtnWhiteBoardAdd.IsEnabled = true; + //if (WhiteboardTotalCount < 99) BtnWhiteBoardAdd.IsEnabled = true; + } + + private bool _whiteboardModePreviousPageButtonEnabled = false; + private bool _whiteboardModeNextPageButtonEnabled = false; + private bool _whiteboardModeNewPageButtonEnabled = false; + private bool _whiteboardModeNewPageButtonMerged = false; + + public bool WhiteboardModePreviousPageButtonEnabled { + get => _whiteboardModePreviousPageButtonEnabled; + set { + _whiteboardModePreviousPageButtonEnabled = value; + var geo = new GeometryDrawing[] + { BtnLeftWhiteBoardSwitchPreviousGeometry, BtnRightWhiteBoardSwitchPreviousGeometry }; + var label = new TextBlock[] + { BtnLeftWhiteBoardSwitchPreviousLabel, BtnRightWhiteBoardSwitchPreviousLabel }; + var border = new Border[] + { BtnWhiteBoardSwitchPreviousL, BtnWhiteBoardSwitchPreviousR }; + foreach (var gd in geo) + gd.Brush = new SolidColorBrush(Color.FromArgb((byte)(value ? 255 : 127), 24, 24, 27)); + foreach (var tb in label) tb.Opacity = value ? 1 : 0.5; + foreach (var bd in border) bd.IsHitTestVisible = value; + } + } + + public bool WhiteboardModeNextPageButtonEnabled { + get => _whiteboardModeNextPageButtonEnabled; + set { + _whiteboardModeNextPageButtonEnabled = value; + var geo = new GeometryDrawing[] + { BtnLeftWhiteBoardSwitchNextGeometry, BtnRightWhiteBoardSwitchNextGeometry }; + var label = new TextBlock[] + { BtnLeftWhiteBoardSwitchNextLabel, BtnRightWhiteBoardSwitchNextLabel }; + var border = new Border[] + { BtnWhiteBoardSwitchNextL, BtnWhiteBoardSwitchNextR }; + foreach (var gd in geo) + gd.Brush = new SolidColorBrush(Color.FromArgb((byte)(value ? 255 : 127), 24, 24, 27)); + foreach (var tb in label) tb.Opacity = value ? 1 : 0.5; + foreach (var bd in border) bd.IsHitTestVisible = value; + } + } + + public bool WhiteboardModeNewPageButtonEnabled { + get => _whiteboardModeNewPageButtonEnabled; + set { + _whiteboardModeNewPageButtonEnabled = value; + var geo = new GeometryDrawing[] + { BtnWhiteboardAddGeometryLeft, BtnWhiteboardAddGeometryRight }; + var label = new TextBlock[] + { BtnWhiteboardAddTextBlockLeft, BtnWhiteboardAddTextBlockRight }; + var border = new Border[] + { BtnWhiteboardAddLeft, BtnWhiteboardAddRight }; + foreach (var gd in geo) + gd.Brush = new SolidColorBrush(Color.FromArgb((byte)(value ? 255 : 127), 24, 24, 27)); + foreach (var tb in label) tb.Opacity = value ? 1 : 0.5; + foreach (var bd in border) bd.IsHitTestVisible = value; + } + } + + public bool WhiteboardModeNewPageButtonMerged { + get => _whiteboardModeNewPageButtonMerged; + set { + _whiteboardModeNewPageButtonMerged = value; + BtnWhiteBoardSwitchNextL.Visibility = value ? Visibility.Collapsed : Visibility.Visible; + BtnLeftPageListWB.CornerRadius = value ? new CornerRadius(0, 5, 5, 0) : new CornerRadius(0); + } } private void UpdateIndexInfoDisplay() { - TextBlockWhiteBoardIndexInfo.Text = + BtnLeftPageListWBTextCount.Text = + $"{CurrentWhiteboardIndex}/{WhiteboardTotalCount}"; + BtnRightPageListWBTextCount.Text = $"{CurrentWhiteboardIndex}/{WhiteboardTotalCount}"; - if (CurrentWhiteboardIndex == WhiteboardTotalCount) { - var newImageSource = new BitmapImage(); - newImageSource.BeginInit(); - newImageSource.UriSource = new Uri("/Resources/Icons-Fluent/ic_fluent_add_circle_24_regular.png", - UriKind.RelativeOrAbsolute); - newImageSource.EndInit(); - //BoardLeftPannelNextPage.Source = newImageSource; - //BoardRightPannelNextPage.Source = newImageSource; - //BoardRightPannelNextPageTextBlock.Text = "加页"; - //BoardLeftPannelNextPageTextBlock.Text = "加页"; - } else { - var newImageSource = new BitmapImage(); - newImageSource.BeginInit(); - newImageSource.UriSource = - new Uri("/Resources/Icons-Fluent/ic_fluent_arrow_circle_right_24_regular.png", - UriKind.RelativeOrAbsolute); - newImageSource.EndInit(); - //BoardLeftPannelNextPage.Source = newImageSource; - //BoardRightPannelNextPage.Source = newImageSource; - //BoardRightPannelNextPageTextBlock.Text = "下一页"; - //BoardLeftPannelNextPageTextBlock.Text = "下一页"; - } - - BtnWhiteBoardSwitchPrevious.IsEnabled = true; - BtnWhiteBoardSwitchNext.IsEnabled = true; - - if (CurrentWhiteboardIndex == 1) { - BtnWhiteBoardSwitchPrevious.IsEnabled = false; - BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27)); - BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5; - BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1; - - BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27)); - BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5; - BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnRightWhiteBoardSwitchNextLabel.Opacity = 1; - } else { - BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1; - - BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1; - - if (CurrentWhiteboardIndex == WhiteboardTotalCount) { - BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27)); - BtnLeftWhiteBoardSwitchNextLabel.Opacity = 0.5; - - BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27)); - BtnRightWhiteBoardSwitchNextLabel.Opacity = 0.5; - BtnWhiteBoardSwitchNext.IsEnabled = false; - } else { - BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1; - - BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27)); - BtnRightWhiteBoardSwitchNextLabel.Opacity = 1; - } - } - - BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1; + WhiteboardModePreviousPageButtonEnabled = CurrentWhiteboardIndex > 1; + WhiteboardModeNextPageButtonEnabled = CurrentWhiteboardIndex < WhiteboardTotalCount; + WhiteboardModeNewPageButtonEnabled = WhiteboardTotalCount < 99; + WhiteboardModeNewPageButtonMerged = CurrentWhiteboardIndex == WhiteboardTotalCount; } } } \ No newline at end of file diff --git a/InkCanvasForClass/MainWindow_cs/MW_FloatingBarIcons.cs b/InkCanvasForClass/MainWindow_cs/MW_FloatingBarIcons.cs index 4df4fd8..a8ee38e 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_FloatingBarIcons.cs @@ -1,5 +1,6 @@ using Ink_Canvas.Helpers; using System; +using System.Collections.Generic; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -570,6 +571,15 @@ namespace Ink_Canvas { LassoSelectIconGeometry }; + SimpleStackPanel[] floatingBarIconsSimpleStackPanels = new SimpleStackPanel[] { + Cursor_Icon, + Pen_Icon, + EraserByStrokes_Icon, + Eraser_Icon, + SymbolIconSelect, + HandFloatingBarBtn, + }; + TextBlock[] iconTextBlocksFloatingBar = new TextBlock[] { SelectionToolBarTextBlock, PenToolbarTextBlock, @@ -629,6 +639,26 @@ namespace Ink_Canvas { var highlightStepWidth = Settings.Appearance.FloatingBarButtonLabelVisibility ? 28 : 21; + var FloatingBarItemsCalc = new List() { + Cursor_Icon, + Pen_Icon, + SymbolIconDelete, + EraserByStrokes_Icon, + Eraser_Icon, + SymbolIconSelect, + ShapeDrawFloatingBarBtn, + FreezeFloatingBarBtn, + HandFloatingBarBtn, + SymbolIconUndo, + SymbolIconRedo, + CursorWithDelFloatingBarBtn, + }; + + var final_items = new List(); + foreach (var fe in FloatingBarItemsCalc) { + if (fe.Visibility != Visibility.Collapsed) final_items.Add(fe); + } + if (mode != ICCToolsEnum.CursorMode) { // floating bar var ngdf = iconGeometryDrawingsFloatingBar[(int)mode]; @@ -636,8 +666,7 @@ namespace Ink_Canvas { iconTextBlocksFloatingBar[(int)mode].Foreground = new SolidColorBrush(Colors.White); ngdf.Geometry = Geometry.Parse(iconGeometryPathStringsFloatingBar[(int)mode+5]); FloatingbarSelectionBG.Visibility = Visibility.Visible; - var iconPosI = (int)mode == 1 ? highlightStepWidth : - (int)mode > 1 ? highlightStepWidth * ((int)mode + 1) : 0; + var iconPosI = final_items.IndexOf(floatingBarIconsSimpleStackPanels[(int)mode])*28; System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, iconPosI); // whiteboard @@ -693,6 +722,9 @@ namespace Ink_Canvas { FreezeIconGeometry.Brush = new SolidColorBrush(Colors.White); FreezeToolbarTextBlock.Foreground = new SolidColorBrush(Colors.White); FloatingbarFreezeBtnBG.Visibility = Visibility.Visible; + var transform = FloatingbarFreezeBtnBG.TransformToVisual(BorderFloatingBarMainControls); + var pt = transform.Transform(new Point(0, 0)); + System.Windows.Controls.Canvas.SetLeft(FloatingbarFreezeBtnBG, pt.X-5); } else { FreezeIconGeometry.Brush = new SolidColorBrush(Color.FromRgb(27, 27, 27)); FreezeToolbarTextBlock.Foreground = new SolidColorBrush(Colors.Black); @@ -807,6 +839,14 @@ namespace Ink_Canvas { RectangleSelectionHitTestBorder.Visibility = Visibility.Collapsed; } + private bool ____isHideSubPanel = true; + + private void PenIconFakeClickForToolBarSettings() { + ____isHideSubPanel = false; + PenIcon_Click(null, null); + ____isHideSubPanel = true; + } + private void PenIcon_Click(object sender, RoutedEventArgs e) { if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel) @@ -834,7 +874,7 @@ namespace Ink_Canvas { CheckEnableTwoFingerGestureBtnVisibility(true); inkCanvas.EditingMode = InkCanvasEditingMode.Ink; ColorSwitchCheck(); - HideSubPanels("pen", true); + if (____isHideSubPanel) HideSubPanels("pen", true); // update tool selection SelectedMode = ICCToolsEnum.PenMode; @@ -887,7 +927,7 @@ namespace Ink_Canvas { { inkCanvas.EditingMode = InkCanvasEditingMode.Ink; ColorSwitchCheck(); - HideSubPanels("pen", true); + if (____isHideSubPanel) HideSubPanels("pen", true); // update tool selection SelectedMode = ICCToolsEnum.PenMode; @@ -1058,7 +1098,39 @@ namespace Ink_Canvas { var floatingBarIconsVisibilityValue = Settings.Appearance.FloatingBarIconsVisibility; var fbivca = floatingBarIconsVisibilityValue.ToCharArray(); for (var i = 0; i < fbivca.Length; i++) { + if (items[i] == EnableTwoFingerGestureBorder) continue; items[i].Visibility = fbivca[i] == '1' ? Visibility.Visible : Visibility.Collapsed; + if (!isLoaded) continue; + if (items[i] == FreezeFloatingBarBtn && IsAnnotationFreezeOn && fbivca[i] == '0') IsAnnotationFreezeOn = false; + if ((items[i] == HandFloatingBarBtn || items[i] == SymbolIconSelect) && fbivca[i] == '0' && + SelectedMode != ICCToolsEnum.PenMode && + SelectedMode != ICCToolsEnum.CursorMode) PenIconFakeClickForToolBarSettings(); + } + + if (StackPanelCanvasControls.Visibility == Visibility.Visible) { + EnableTwoFingerGestureBorder.Visibility = fbivca[9] == '1' ? Visibility.Visible : Visibility.Collapsed; + } + + Eraser_Icon.Visibility = Visibility.Visible; + EraserByStrokes_Icon.Visibility = Visibility.Visible; + + if (Settings.Appearance.EraserButtonsVisibility == 1) EraserByStrokes_Icon.Visibility = Visibility.Collapsed; + else if (Settings.Appearance.EraserButtonsVisibility == 2) Eraser_Icon.Visibility = Visibility.Collapsed; + + if (((SelectedMode == ICCToolsEnum.EraseByStrokeMode && Settings.Appearance.EraserButtonsVisibility == 1) + || (SelectedMode == ICCToolsEnum.EraseByGeometryMode && + Settings.Appearance.EraserButtonsVisibility == 2)) && isLoaded) PenIconFakeClickForToolBarSettings(); + + SettingsOnlyDisplayEraserBtnPanel.Visibility = Settings.Appearance.EraserButtonsVisibility == 0 + ? Visibility.Collapsed + : Visibility.Visible; + + if (Settings.Appearance.OnlyDisplayEraserBtn && Settings.Appearance.EraserButtonsVisibility != 0) { + InkEraserToolbarTextBlock.Text = "橡皮"; + CircleEraserToolbarTextBlock.Text = "橡皮"; + } else { + InkEraserToolbarTextBlock.Text = "线擦"; + CircleEraserToolbarTextBlock.Text = "板擦"; } } diff --git a/InkCanvasForClass/MainWindow_cs/MW_Settings.cs b/InkCanvasForClass/MainWindow_cs/MW_Settings.cs index 6350c54..c92b7c4 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_Settings.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_Settings.cs @@ -820,10 +820,39 @@ namespace Ink_Canvas { Settings.Appearance.FloatingBarIconsVisibility = vsb.ToString(); UpdateFloatingBarIconsVisibility(); + ForceUpdateToolSelection(null); + Dispatcher.InvokeAsync(async () => { + if (BorderFloatingBarExitPPTBtn.Visibility == Visibility.Visible) { + await Task.Delay(10); + ViewboxFloatingBarMarginAnimation(60); + } else if (Topmost == true) //非黑板 + { + await Task.Delay(10); + ViewboxFloatingBarMarginAnimation(100, true); + } else //黑板 + { + await Task.Delay(10); + ViewboxFloatingBarMarginAnimation(60); + } + }); SaveSettingsToFile(); } + private void ComboBoxEraserButton_SelectionChanged(object sender, SelectionChangedEventArgs e) { + if (!isLoaded) return; + Settings.Appearance.EraserButtonsVisibility = ComboBoxEraserButton.SelectedIndex; + UpdateFloatingBarIconsVisibility(); + SaveSettingsToFile(); + } + + private void ToggleSwitchOnlyDisplayEraserBtn_OnToggled(object sender, RoutedEventArgs e) { + if (!isLoaded) return; + Settings.Appearance.OnlyDisplayEraserBtn = ToggleSwitchOnlyDisplayEraserBtn.IsOn; + UpdateFloatingBarIconsVisibility(); + SaveSettingsToFile(); + } + #endregion #region Canvas @@ -1577,6 +1606,8 @@ namespace Ink_Canvas { Settings.Appearance.EnableTrayIcon = true; Settings.Appearance.FloatingBarButtonLabelVisibility = true; Settings.Appearance.FloatingBarIconsVisibility = "11111111"; + Settings.Appearance.EraserButtonsVisibility = 0; + Settings.Appearance.OnlyDisplayEraserBtn = false; Settings.Automation.IsAutoFoldInEasiNote = true; Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno = true; diff --git a/InkCanvasForClass/MainWindow_cs/MW_SettingsToLoad.cs b/InkCanvasForClass/MainWindow_cs/MW_SettingsToLoad.cs index c1751aa..b2e8953 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_SettingsToLoad.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_SettingsToLoad.cs @@ -353,6 +353,9 @@ namespace Ink_Canvas { items[i].IsChecked = fbivca[i] == '1'; } + ComboBoxEraserButton.SelectedIndex = Settings.Appearance.EraserButtonsVisibility; + ToggleSwitchOnlyDisplayEraserBtn.IsOn = Settings.Appearance.OnlyDisplayEraserBtn; + UpdateFloatingBarIconsVisibility(); FloatingBarTextVisibilityBindingLikeAPieceOfShit.Visibility = Settings.Appearance.FloatingBarButtonLabelVisibility ? Visibility.Visible : Visibility.Collapsed; diff --git a/InkCanvasForClass/MainWindow_cs/MW_Storage.cs b/InkCanvasForClass/MainWindow_cs/MW_Storage.cs index ca36ee8..442b51a 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_Storage.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_Storage.cs @@ -162,7 +162,7 @@ namespace Ink_Canvas { ComboBoxStoragePath.SelectedIndex = storageLocationItems.Count - 1; } - if (isLoaded) CustomStorageLocationGroup.Visibility = ((StorageLocationItem)ComboBoxStoragePath.SelectedItem).SelectItem == "c-" ? Visibility.Visible : Visibility.Collapsed; + if (isLoaded) CustomStorageLocationGroup.Visibility = Settings.Storage.StorageLocation == "c-" ? Visibility.Visible : Visibility.Collapsed; if (isLoaded) CustomStorageLocation.Text = Settings.Storage.UserStorageLocation; } diff --git a/InkCanvasForClass/Resources/Settings.cs b/InkCanvasForClass/Resources/Settings.cs index 8493dd0..0425003 100644 --- a/InkCanvasForClass/Resources/Settings.cs +++ b/InkCanvasForClass/Resources/Settings.cs @@ -232,8 +232,12 @@ namespace Ink_Canvas public int Theme { get; set; } = 0; [JsonProperty("floatingBarButtonLabelVisibility")] public bool FloatingBarButtonLabelVisibility = true; - [JsonProperty("FloatingBarIconsVisibility")] - public string FloatingBarIconsVisibility = "11111111"; + [JsonProperty("floatingBarIconsVisibility")] + public string FloatingBarIconsVisibility = "1111111111"; + [JsonProperty("eraserButtonsVisibility")] + public int EraserButtonsVisibility = 0; + [JsonProperty("onlyDisplayEraserBtn")] + public bool OnlyDisplayEraserBtn = false; } public class PowerPointSettings