From 44261434bb2e11b4da20d3f3dfd019515c12b346 Mon Sep 17 00:00:00 2001
From: MakesYT <2696703792@qq.com>
Date: Fri, 12 Jul 2024 23:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=83=85=E6=99=AF?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0Enum=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Core/Core.csproj | 9 +-
KitopiaAvalonia/Controls/HotKeyShowItme.axaml | 83 ++--
KitopiaAvalonia/Controls/ListShow.axaml | 2 +-
KitopiaAvalonia/KitopiaAvalonia.csproj | 10 +-
.../Pages/MyDataTemplateSelector.cs | 47 +--
.../Services/ScreenCaptureWindow.cs | 1 +
KitopiaAvalonia/Styles/FAColorPicker.axaml | 198 +++++-----
KitopiaAvalonia/Styles/FluentUiStyles.axaml | 359 +++++++++++++++++-
KitopiaAvalonia/Windows/Dialog.axaml | 219 ++++++-----
.../Windows/ScreenCaptureWindow.axaml | 42 +-
KitopiaAvalonia/Windows/TaskEditor.axaml | 52 ++-
PluginCore | 2 +-
12 files changed, 701 insertions(+), 323 deletions(-)
diff --git a/Core/Core.csproj b/Core/Core.csproj
index ceb718b..1a7fd9f 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -10,6 +10,7 @@
enable
enable
true
+ 11.2.999-cibuild0050044-alpha
@@ -30,12 +31,12 @@
-->
-
-
+
+
-
+
-
+
diff --git a/KitopiaAvalonia/Controls/HotKeyShowItme.axaml b/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
index a6e134c..413264f 100644
--- a/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
+++ b/KitopiaAvalonia/Controls/HotKeyShowItme.axaml
@@ -1,7 +1,6 @@
+ xmlns:controls="using:KitopiaAvalonia.Controls">
@@ -10,57 +9,51 @@
-
-
-
-
-
-
-
-
-
-
-
+ VerticalAlignment="{TemplateBinding VerticalAlignment}">
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/KitopiaAvalonia/Controls/ListShow.axaml b/KitopiaAvalonia/Controls/ListShow.axaml
index 300e98d..c022b0d 100644
--- a/KitopiaAvalonia/Controls/ListShow.axaml
+++ b/KitopiaAvalonia/Controls/ListShow.axaml
@@ -60,7 +60,7 @@
@@ -498,4 +518,4 @@
-
+
\ No newline at end of file
diff --git a/KitopiaAvalonia/Styles/FluentUiStyles.axaml b/KitopiaAvalonia/Styles/FluentUiStyles.axaml
index 051cd31..1b4a1d4 100644
--- a/KitopiaAvalonia/Styles/FluentUiStyles.axaml
+++ b/KitopiaAvalonia/Styles/FluentUiStyles.axaml
@@ -3,7 +3,7 @@
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
210
- 0,48,0,0
+ 0,48,0,0
0,0,0,0
@@ -18,11 +18,11 @@
-
+
-
+
-
+
@@ -46,7 +46,7 @@
@@ -56,7 +56,7 @@
@@ -68,7 +68,7 @@
@@ -77,7 +77,7 @@
@@ -87,7 +87,7 @@
@@ -97,7 +97,7 @@
@@ -107,4 +107,331 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/KitopiaAvalonia/Windows/Dialog.axaml b/KitopiaAvalonia/Windows/Dialog.axaml
index 02ea820..8dc1198 100644
--- a/KitopiaAvalonia/Windows/Dialog.axaml
+++ b/KitopiaAvalonia/Windows/Dialog.axaml
@@ -1,125 +1,122 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ x:Class="KitopiaAvalonia.Controls.Dialog"
+ Foreground="{DynamicResource ContentDialogForeground}"
+
+ BorderBrush="{DynamicResource ContentDialogBorderBrush}"
+ BorderThickness="{DynamicResource ContentDialogBorderWidth}"
+ CornerRadius="{DynamicResource OverlayCornerRadius}"
+ Topmost="True"
+ CanResize="False"
+ SystemDecorations="BorderOnly"
+ ExtendClientAreaChromeHints="NoChrome"
+ ExtendClientAreaTitleBarHeightHint="25"
+ ExtendClientAreaToDecorationsHint="True"
+ WindowStartupLocation="CenterScreen"
+ ShowInTaskbar="False"
+ Name="myWindow"
+ SizeToContent="WidthAndHeight"
+
+ TransparencyLevelHint="AcrylicBlur"
+ Title="Dialog">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
index b4daf05..f524f5a 100644
--- a/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
+++ b/KitopiaAvalonia/Windows/ScreenCaptureWindow.axaml
@@ -8,16 +8,17 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="KitopiaAvalonia.Windows.ScreenCaptureWindow"
Title="ScreenCaptureWindow">
-
+