代码清理

2025-12-27 12:05:34 +08:00
parent d7e8330016
commit 783e5c43a5
9 changed files with 53 additions and 46 deletions
@@ -73,35 +73,40 @@ namespace Ink_Canvas
        /// <summary>
        /// 用於更新浮動工具欄的"手勢"按鈕和白板工具欄的"手勢"按鈕的樣式（開啟和關閉狀態）
        /// </summary>
-        private void CheckEnableTwoFingerGestureBtnColorPrompt() {
+        private void CheckEnableTwoFingerGestureBtnColorPrompt()
+        {
            // 根据主题选择手势图标和颜色
            bool isDarkTheme = Settings.Appearance.Theme == 1 ||
                               (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
            bool isLightTheme = !isDarkTheme;
            string gestureIconPath = isLightTheme ? "/Resources/new-icons/gesture.png" : "/Resources/new-icons/gesture_white.png";
-            
+
            // 根据主题设置白板模式下的颜色
            Color boardBgColor, boardIconColor, boardTextColor, boardBorderColor;
-            if (isLightTheme) {
+            if (isLightTheme)
+            {
                // 浅色主题
                boardBgColor = Color.FromRgb(244, 244, 245);
                boardIconColor = Color.FromRgb(24, 24, 27);
                boardTextColor = Color.FromRgb(24, 24, 27);
                boardBorderColor = Color.FromRgb(161, 161, 170);
-            } else {
+            }
+            else
+            {
                // 深色主题
                boardBgColor = Color.FromRgb(39, 39, 42);
                boardIconColor = Color.FromRgb(244, 244, 245);
                boardTextColor = Color.FromRgb(244, 244, 245);
                boardBorderColor = Color.FromRgb(113, 113, 122);
            }
-            
-            if (ToggleSwitchEnableMultiTouchMode.IsOn) {
+
+            if (ToggleSwitchEnableMultiTouchMode.IsOn)
+            {
                TwoFingerGestureSimpleStackPanel.Opacity = 0.5;
                TwoFingerGestureSimpleStackPanel.IsHitTestVisible = false;
                EnableTwoFingerGestureBtn.Source =
                    new BitmapImage(new Uri(gestureIconPath, UriKind.Relative));
-                
+
                BoardGesture.Background = new SolidColorBrush(boardBgColor);
                BoardGestureGeometry.Brush = new SolidColorBrush(boardIconColor);
                BoardGestureGeometry2.Brush = new SolidColorBrush(boardIconColor);
@@ -110,25 +115,28 @@ namespace Ink_Canvas
                BoardGestureGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.DisabledGestureIcon);
                BoardGestureGeometry2.Geometry = Geometry.Parse("F0 M24,24z M0,0z");
            }
-            else {
+            else
+            {
                TwoFingerGestureSimpleStackPanel.Opacity = 1;
                TwoFingerGestureSimpleStackPanel.IsHitTestVisible = true;
-                if (Settings.Gesture.IsEnableTwoFingerGesture) {
+                if (Settings.Gesture.IsEnableTwoFingerGesture)
+                {
                    EnableTwoFingerGestureBtn.Source =
                        new BitmapImage(new Uri("/Resources/new-icons/gesture-enabled.png", UriKind.Relative));
-                    
+
                    BoardGesture.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
                    BoardGestureGeometry.Brush = new SolidColorBrush(Colors.GhostWhite);
                    BoardGestureGeometry2.Brush = new SolidColorBrush(Colors.GhostWhite);
                    BoardGestureLabel.Foreground = new SolidColorBrush(Colors.GhostWhite);
                    BoardGesture.BorderBrush = new SolidColorBrush(Color.FromRgb(37, 99, 235));
                    BoardGestureGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.EnabledGestureIcon);
-                    BoardGestureGeometry2.Geometry = Geometry.Parse("F0 M24,24z M0,0z "+XamlGraphicsIconGeometries.EnabledGestureIconBadgeCheck);
+                    BoardGestureGeometry2.Geometry = Geometry.Parse("F0 M24,24z M0,0z " + XamlGraphicsIconGeometries.EnabledGestureIconBadgeCheck);
                }
-                else {
+                else
+                {
                    EnableTwoFingerGestureBtn.Source =
                        new BitmapImage(new Uri(gestureIconPath, UriKind.Relative));
-                    
+
                    BoardGesture.Background = new SolidColorBrush(boardBgColor);
                    BoardGestureGeometry.Brush = new SolidColorBrush(boardIconColor);
                    BoardGestureGeometry2.Brush = new SolidColorBrush(boardIconColor);
@@ -5,8 +5,8 @@ using OSVersionExtension;
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Threading.Tasks;
 using System.Net.Http;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
@@ -1031,7 +1031,7 @@ namespace Ink_Canvas
            bool isHalfOpacity = (bool)((CheckBox)sender).IsChecked;
            c[1] = isHalfOpacity ? '2' : '1';
            Settings.PowerPointSettings.PPTSButtonsOption = int.Parse(new string(c));
-            
+
            // 如果开启半透明选项，设置默认透明度为0.5；否则为1.0
            if (isHalfOpacity)
            {
@@ -1051,7 +1051,7 @@ namespace Ink_Canvas
                PPTLSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLSButtonOpacity;
                PPTRSButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRSButtonOpacity;
            }
-            
+
            SaveSettingsToFile();
            // 更新PPT UI管理器设置
            if (_pptUIManager != null && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
@@ -1106,7 +1106,7 @@ namespace Ink_Canvas
            bool isHalfOpacity = (bool)((CheckBox)sender).IsChecked;
            c[1] = isHalfOpacity ? '2' : '1';
            Settings.PowerPointSettings.PPTBButtonsOption = int.Parse(new string(c));
-            
+
            // 如果开启半透明选项，设置默认透明度为0.5；否则为1.0
            if (isHalfOpacity)
            {
@@ -1126,7 +1126,7 @@ namespace Ink_Canvas
                PPTLBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTLBButtonOpacity;
                PPTRBButtonOpacityValueSlider.Value = Settings.PowerPointSettings.PPTRBButtonOpacity;
            }
-            
+
            SaveSettingsToFile();
            UpdatePPTUIManagerSettings();
            UpdatePPTBtnPreview();
@@ -557,12 +557,12 @@ namespace Ink_Canvas
                // 重用之前定义的sopsc和bopsc变量
                bool isSideHalfOpacity = sopsc.Length >= 2 && sopsc[1] == '2';
                // 如果透明度为0或未设置，根据半透明选项设置默认值
-                if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.0 || 
+                if (Settings.PowerPointSettings.PPTLSButtonOpacity == 0.0 ||
                    (Settings.PowerPointSettings.PPTLSButtonOpacity == 1.0 && isSideHalfOpacity))
                {
                    Settings.PowerPointSettings.PPTLSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
                }
-                if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.0 || 
+                if (Settings.PowerPointSettings.PPTRSButtonOpacity == 0.0 ||
                    (Settings.PowerPointSettings.PPTRSButtonOpacity == 1.0 && isSideHalfOpacity))
                {
                    Settings.PowerPointSettings.PPTRSButtonOpacity = isSideHalfOpacity ? 0.5 : 1.0;
@@ -572,12 +572,12 @@ namespace Ink_Canvas

                bool isBottomHalfOpacity = bopsc.Length >= 2 && bopsc[1] == '2';
                // 如果透明度为0或未设置，根据半透明选项设置默认值
-                if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.0 || 
+                if (Settings.PowerPointSettings.PPTLBButtonOpacity == 0.0 ||
                    (Settings.PowerPointSettings.PPTLBButtonOpacity == 1.0 && isBottomHalfOpacity))
                {
                    Settings.PowerPointSettings.PPTLBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;
                }
-                if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.0 || 
+                if (Settings.PowerPointSettings.PPTRBButtonOpacity == 0.0 ||
                    (Settings.PowerPointSettings.PPTRBButtonOpacity == 1.0 && isBottomHalfOpacity))
                {
                    Settings.PowerPointSettings.PPTRBButtonOpacity = isBottomHalfOpacity ? 0.5 : 1.0;