*截图优化细节

MakesYT · Jan 11, 2025 · 5e1a0af · 5e1a0af
1 parent 2498926
commit 5e1a0af
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 26 deletions.
diff --git a/Core.Window/ScreenCapture/CaptureTool.cs b/Core.Window/ScreenCapture/CaptureTool.cs
@@ -64,8 +64,8 @@ public static unsafe byte[] GetBytesSpan(MappedSubresource mappedSubresource, Ou
                     outputDesc.WhitePoint[1]
                 ],
                 [
-                    .640f, .330f, .300f, .600f, .150f, .060f, outputDesc.WhitePoint[0],
-                    outputDesc.WhitePoint[1]
+                    .640f, .330f, .300f, .600f, .150f, .060f, .3127f,
+                    .3290f
                 ]
             );
             var span = new ReadOnlySpan<Half>(mappedSubresource.PData,

diff --git a/Core/SDKs/CustomScenario/CustomScenario.cs b/Core/SDKs/CustomScenario/CustomScenario.cs
@@ -487,13 +487,11 @@ private void ParsePointItem(Dictionary<ScenarioMethodNode, Thread?> threads,
             catch (Exception e)
             {
                 Log.Error("错误",e);
-                if (e.InnerException is not null)
-                {
-                    ((IToastService)ServiceManager.Services.GetService(typeof(IToastService))!).Show("情景",
-                        $"情景{Name}出现错误\n{e.InnerException?.Message}");
-                }else ((IToastService)ServiceManager.Services.GetService(typeof(IToastService))!).Show("情景",
-                    $"情景{Name}出现错误\n{e.Message}");
-
+                ((IToastService)ServiceManager.Services.GetService(typeof(IToastService))!).Show("情景",
+                    e.InnerException is not null
+                        ? $"情景{Name}出现错误\n{e.InnerException?.Message}"
+                        : $"情景{Name}出现错误\n{e.Message}");
+
                 Task.Run(() => { Stop(true); });
 
                 valid = false;

diff --git a/KitopiaAvalonia/Controls/Capture/DraggableResizeableControl.axaml.cs b/KitopiaAvalonia/Controls/Capture/DraggableResizeableControl.axaml.cs
@@ -300,11 +300,9 @@ private void UpdatePointerOnResizeSizeBoxBorder(Point position)
 
     private void UpdateCursor(string cursor)
     {
-        if (!Cursor.ToString().Equals(cursor))
-        {
-            Cursor?.Dispose();
-            Cursor = new Cursor(Enum.Parse<StandardCursorType>(cursor));
-        }
+        if (Cursor == null || Cursor.ToString().Equals(cursor)) return;
+        Cursor?.Dispose();
+        Cursor = new Cursor(Enum.Parse<StandardCursorType>(cursor));
     }
 
     #endregion

diff --git a/KitopiaAvalonia/Windows/MainWindow.axaml b/KitopiaAvalonia/Windows/MainWindow.axaml
@@ -12,6 +12,7 @@
               xmlns:controls="clr-namespace:KitopiaAvalonia.Controls"
               xmlns:converter="clr-namespace:KitopiaAvalonia.Converter"
               Icon="/Assets/icon.png"
+              WindowState="Minimized"
               IsTitleBarVisible="True"
               Title="Kitopia">
 

diff --git a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
@@ -157,9 +157,7 @@
 
         </Border>
 
-
-        <Line ZIndex="2" Name="X" Fill="WhiteSmoke" Stroke="WhiteSmoke" StrokeThickness="1.5" IsVisible="False" />
-        <Line ZIndex="2" Name="Y" Fill="WhiteSmoke" Stroke="WhiteSmoke" StrokeThickness="1.5" IsVisible="False" />
+
 
     </Canvas>
 </Window>
diff --git a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml.cs b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml.cs
@@ -228,8 +228,6 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
                 .Properties.IsLeftButtonPressed && !IsSelected)
         {
             Selecting = true;
-            X.IsVisible = false;
-            Y.IsVisible = false;
             SelectBox.IsVisible = true;
             Cursor?.Dispose();
             Cursor = new Cursor(StandardCursorType.BottomRightCorner);
@@ -259,8 +257,6 @@ protected override void OnPointerExited(PointerEventArgs e)
     {
         base.OnPointerExited(e);
         PointerOver = false;
-        X.IsVisible = false;
-        Y.IsVisible = false;
     }
 
     protected override void OnPointerMoved(PointerEventArgs e)
@@ -338,11 +334,6 @@ protected override void OnPointerMoved(PointerEventArgs e)
             SelectBox.IsVisible = true;
             UpdateSelectBox();
         }
-        else
-        {
-            X.IsVisible = false;
-            Y.IsVisible = false;
-        }
     }
 
     public 截图工具 NowTool = 截图工具.无;
@@ -784,6 +775,7 @@ private void UpdateSelectBox()
             GeometryCombineMode = GeometryCombineMode.Exclude
         };
         Rectangle.Clip = combinedGeometry;
+        Rectangle.InvalidateVisual();
     }
 
     private void UpdateToolBar()