From 26b051b222c88fe15b3973e357957dcafd032627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E5=B8=BD?= <761716178@qq.com> Date: Wed, 27 Dec 2023 15:24:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CPF.Linux/CPF.Linux.csproj | 3 ++- CPF.Mac/CPF.Mac.csproj | 3 ++- CPF.Skia/CPF.Skia.csproj | 3 ++- CPF.Windows/CPF.Windows.csproj | 3 ++- CPF/Binding.cs | 4 ++-- CPF/CPF.csproj | 6 +++--- CPF/Controls/CodeTextBox/CodeTextBox.cs | 6 +++--- CPF/Controls/CodeTextBox/CodeTextView.cs | 2 +- CPF/Controls/ItemCollection.cs | 2 +- CPF/Controls/View.cs | 2 +- CPF/CpfObject.cs | 27 +++++++++++++++++++++++- CPF/Design/DesignPlatform.cs | 2 +- CPF/Documents/Block.cs | 2 +- CPF/Documents/IDocumentContainer.cs | 2 +- CPF/Net4/EventHandler.cs | 2 +- CPF/Net4/WeakReference.cs | 2 +- CPF/ObjectExtenstions.cs | 4 ++-- CPF/Platform/Application.cs | 2 +- CPF/Platform/RuntimePlatform.cs | 2 +- CPF/Platform/Screen.cs | 2 +- CPF/Shapes/Polyline.cs | 2 +- CPF/Threading/DispatcherTimer.cs | 2 +- CPF/UIElement.cs | 2 +- CPF/UIElementCollection.cs | 2 +- 24 files changed, 59 insertions(+), 30 deletions(-) diff --git a/CPF.Linux/CPF.Linux.csproj b/CPF.Linux/CPF.Linux.csproj index 1f0e1e2..391f66f 100644 --- a/CPF.Linux/CPF.Linux.csproj +++ b/CPF.Linux/CPF.Linux.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 0.9.6.6 + 0.9.6.7 QQ:761716178 QQ:761716178 QQ:761716178 跨平台UI框架 @@ -12,6 +12,7 @@ Xhm.CPF.Linux false true + false diff --git a/CPF.Mac/CPF.Mac.csproj b/CPF.Mac/CPF.Mac.csproj index 54153b9..6a7dcf0 100644 --- a/CPF.Mac/CPF.Mac.csproj +++ b/CPF.Mac/CPF.Mac.csproj @@ -3,7 +3,7 @@ netstandard2.1 QQ:761716178 跨平台UI框架 - 0.9.6.6 + 0.9.6.7 Xhm.CPF.Mac CPF(Cross platform UI framework) QQ:761716178 跨平台UI框架 http://cpf.cskin.net/ Copyright (c) 2020 by http://cpf.cskin.net/ @@ -11,6 +11,7 @@ QQ:761716178 QQ:761716178 true + false diff --git a/CPF.Skia/CPF.Skia.csproj b/CPF.Skia/CPF.Skia.csproj index d1a32b3..e004b4b 100644 --- a/CPF.Skia/CPF.Skia.csproj +++ b/CPF.Skia/CPF.Skia.csproj @@ -3,13 +3,14 @@ netstandard2.0 QQ:761716178 跨平台UI框架 - 0.9.6.6 + 0.9.6.7 Xhm.CPF.Skia CPF(Cross platform UI framework) QQ:761716178 跨平台UI框架 http://cpf.cskin.net/ Copyright (c) 2020 by http://cpf.cskin.net/ CPF(Cross platform UI framework) QQ:761716178 跨平台UI框架 http://cpf.cskin.net/ QQ:761716178 QQ:761716178 + false diff --git a/CPF.Windows/CPF.Windows.csproj b/CPF.Windows/CPF.Windows.csproj index 165a08d..3e8368f 100644 --- a/CPF.Windows/CPF.Windows.csproj +++ b/CPF.Windows/CPF.Windows.csproj @@ -3,7 +3,7 @@ net40;netstandard2.0;net5 QQ:761716178 跨平台UI框架 - 0.9.6.6 + 0.9.6.7 Xhm.CPF.Windows CPF(Cross platform UI framework) QQ:761716178 跨平台UI框架 http://cpf.cskin.net/ http://cpf.cskin.net/ @@ -55,6 +55,7 @@ Net4 + false diff --git a/CPF/Binding.cs b/CPF/Binding.cs index f58af5c..d72013f 100644 --- a/CPF/Binding.cs +++ b/CPF/Binding.cs @@ -1009,7 +1009,7 @@ namespace CPF public bool ReadValue(out T value) where T : struct { value = default; -#if Net4 +#if NET40 int len = Marshal.SizeOf(typeof(T)); #else int len = Marshal.SizeOf(); @@ -1018,7 +1018,7 @@ namespace CPF { IntPtr ptr = Marshal.AllocHGlobal(len); Marshal.Copy(data, 0, ptr, len); -#if Net4 +#if NET40 value = (T)Marshal.PtrToStructure(ptr, typeof(T)); #else value = Marshal.PtrToStructure(ptr); diff --git a/CPF/CPF.csproj b/CPF/CPF.csproj index 6b672d5..16e32b4 100644 --- a/CPF/CPF.csproj +++ b/CPF/CPF.csproj @@ -6,7 +6,7 @@ QQ:761716178 QQ:761716178 跨平台UI框架 CPF(Cross platform UI framework) QQ:761716178 跨平台UI框架 http://cpf.cskin.net/ - 0.9.6.6 + 0.9.6.7 9.0 Xhm.CPF @@ -50,7 +50,7 @@ - + @@ -95,7 +95,7 @@ - Net4 + false diff --git a/CPF/Controls/CodeTextBox/CodeTextBox.cs b/CPF/Controls/CodeTextBox/CodeTextBox.cs index 9aa4271..4879bbb 100644 --- a/CPF/Controls/CodeTextBox/CodeTextBox.cs +++ b/CPF/Controls/CodeTextBox/CodeTextBox.cs @@ -225,7 +225,7 @@ namespace CPF.Controls /// /// 布局好的行 /// -#if Net4 +#if NET40 public IList Lines { get { return codeTextView.Lines; } @@ -269,7 +269,7 @@ namespace CPF.Controls if (render) { render = false; -#if Net4 +#if NET40 await TaskEx.Delay(30); #else await Task.Delay(30); @@ -285,7 +285,7 @@ namespace CPF.Controls Cancellation = new CancellationTokenSource(); } var ks = KeywordsStyles.ToArray(); -#if Net4 +#if NET40 var styles = await TaskEx.Run(() => CodeTextView.RenderKeywords(Cancellation.Token, ks, codeTextView.Text)); #else var styles = await Task.Run(() => CodeTextView.RenderKeywords(Cancellation.Token, ks, codeTextView.Text)); diff --git a/CPF/Controls/CodeTextBox/CodeTextView.cs b/CPF/Controls/CodeTextBox/CodeTextView.cs index c530f13..dd71e63 100644 --- a/CPF/Controls/CodeTextBox/CodeTextView.cs +++ b/CPF/Controls/CodeTextBox/CodeTextView.cs @@ -742,7 +742,7 @@ namespace CPF.Controls /// /// 布局好的行 /// -#if Net4 +#if NET40 public IList Lines { get { return lines; } diff --git a/CPF/Controls/ItemCollection.cs b/CPF/Controls/ItemCollection.cs index b8c9b61..0cb5a1b 100644 --- a/CPF/Controls/ItemCollection.cs +++ b/CPF/Controls/ItemCollection.cs @@ -273,7 +273,7 @@ namespace CPF.Controls /// 缓存的属性 /// 降序 public void Sort(Comparison comparison, string propertyName = null, bool descending = false) - {//选择排序 + { Events[nameof(StartSort)]?.Invoke(this, EventArgs.Empty); this.comparison = comparison; diff --git a/CPF/Controls/View.cs b/CPF/Controls/View.cs index e5bd630..f5b4662 100644 --- a/CPF/Controls/View.cs +++ b/CPF/Controls/View.cs @@ -174,7 +174,7 @@ namespace CPF.Controls { try { -#if Net4 +#if NET40 if (item.CanRead && item.GetGetMethod().GetParameters().Length == 0) { var v = item.GetValue(ele, null); diff --git a/CPF/CpfObject.cs b/CPF/CpfObject.cs index c8f1010..a7bb332 100644 --- a/CPF/CpfObject.cs +++ b/CPF/CpfObject.cs @@ -3044,7 +3044,32 @@ namespace CPF public void Sort(IComparer comparison) { - Array.Sort(_items, 0, Count, comparison); + //Array.Sort(_items, 0, Count, comparison); + InsertSort(_items, Count, comparison); + } + + //插入排序法 + void InsertSort(T[] array, int count, IComparer comparison) + { + //for循环：i作为指针，进行从左到右扫描数据的工作 + //指针i从1开始扫描，因为i=0时指针左侧无元素 + for (int i = 1; i < count; i++) + { + //temp作为指针键值 + var temp = array[i]; + + //新建变量j，从i开始向左扫描已经有序的元素，并与temp比较 + //若temp小于扫描元素，则将j指针元素向右移位腾出空间 + int j = i; + while (j > 0 && comparison.Compare(array[j - 1], temp) > 0)//array[j - 1] > temp + { + array[j] = array[j - 1]; + j--; + } + //循环完成后将temp放在j指针位置，完成本次插入 + array[j] = temp; + } + } } diff --git a/CPF/Design/DesignPlatform.cs b/CPF/Design/DesignPlatform.cs index 3e2afca..dbe88d6 100644 --- a/CPF/Design/DesignPlatform.cs +++ b/CPF/Design/DesignPlatform.cs @@ -45,7 +45,7 @@ namespace CPF.Design } Screen[] screens = new Screen[] { new Screen(new Rect(0, 0, 1920, 1080), new Rect(0, 0, 1920, 1080), true) }; -#if Net4 +#if NET40 public override IList GetAllScreen() { return screens; diff --git a/CPF/Documents/Block.cs b/CPF/Documents/Block.cs index 77f2b04..58b315d 100644 --- a/CPF/Documents/Block.cs +++ b/CPF/Documents/Block.cs @@ -211,7 +211,7 @@ namespace CPF.Documents /// /// 布局好的行 /// -#if Net4 +#if NET40 public IList Lines { get { return lines; } diff --git a/CPF/Documents/IDocumentContainer.cs b/CPF/Documents/IDocumentContainer.cs index 2f23e6a..93754ef 100644 --- a/CPF/Documents/IDocumentContainer.cs +++ b/CPF/Documents/IDocumentContainer.cs @@ -17,7 +17,7 @@ namespace CPF.Documents /// /// 布局好的行 /// -#if Net4 +#if NET40 IList Lines { get; } #else IReadOnlyList Lines { get; } diff --git a/CPF/Net4/EventHandler.cs b/CPF/Net4/EventHandler.cs index 72a0345..2b24125 100644 --- a/CPF/Net4/EventHandler.cs +++ b/CPF/Net4/EventHandler.cs @@ -1,4 +1,4 @@ -#if Net4 +#if NET40 using System; using System.Collections.Generic; using System.Linq; diff --git a/CPF/Net4/WeakReference.cs b/CPF/Net4/WeakReference.cs index d2ffdbc..6426b48 100644 --- a/CPF/Net4/WeakReference.cs +++ b/CPF/Net4/WeakReference.cs @@ -1,4 +1,4 @@ -#if Net4 +#if NET40 using System; using System.Collections.Generic; using System.Linq; diff --git a/CPF/ObjectExtenstions.cs b/CPF/ObjectExtenstions.cs index b9f87f9..0520e96 100644 --- a/CPF/ObjectExtenstions.cs +++ b/CPF/ObjectExtenstions.cs @@ -535,7 +535,7 @@ namespace CPF }; layer.ShowDialog(root); return await -#if Net4 +#if NET40 TaskEx #else Task @@ -574,7 +574,7 @@ namespace CPF }; layer.ShowDialog(root); await -#if Net4 +#if NET40 TaskEx #else Task diff --git a/CPF/Platform/Application.cs b/CPF/Platform/Application.cs index 39c8102..1fe0532 100644 --- a/CPF/Platform/Application.cs +++ b/CPF/Platform/Application.cs @@ -39,7 +39,7 @@ namespace CPF.Platform { Threading.Dispatcher.mainId = Thread.CurrentThread.ManagedThreadId; CPF.Threading.Dispatcher.mainThread = null; -#if Net4 +#if NET40 OperatingSystem = OperatingSystemType.Windows; foreach (var item in runtimes) { diff --git a/CPF/Platform/RuntimePlatform.cs b/CPF/Platform/RuntimePlatform.cs index 7806ac3..0843ddf 100644 --- a/CPF/Platform/RuntimePlatform.cs +++ b/CPF/Platform/RuntimePlatform.cs @@ -25,7 +25,7 @@ namespace CPF.Platform public abstract INotifyIconImpl CreateNotifyIcon(); -#if Net4 +#if NET40 public abstract IList GetAllScreen(); #else public abstract IReadOnlyList GetAllScreen(); diff --git a/CPF/Platform/Screen.cs b/CPF/Platform/Screen.cs index c46e0d3..7a31a90 100644 --- a/CPF/Platform/Screen.cs +++ b/CPF/Platform/Screen.cs @@ -8,7 +8,7 @@ namespace CPF.Platform public class Screen { -#if Net4 +#if NET40 private static IList _allScreens; public static IList AllScreens #else diff --git a/CPF/Shapes/Polyline.cs b/CPF/Shapes/Polyline.cs index 32c7e27..a874797 100644 --- a/CPF/Shapes/Polyline.cs +++ b/CPF/Shapes/Polyline.cs @@ -23,7 +23,7 @@ namespace CPF.Shapes if (points == null) { points = new Collection(); -//#if Net4 +//#if NET40 points.CollectionChanged += Points_CollectionChanged; //#else // var method = typeof(Polyline).GetMethod(nameof(Points_CollectionChanged), System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); diff --git a/CPF/Threading/DispatcherTimer.cs b/CPF/Threading/DispatcherTimer.cs index 71be223..15b234f 100644 --- a/CPF/Threading/DispatcherTimer.cs +++ b/CPF/Threading/DispatcherTimer.cs @@ -77,7 +77,7 @@ namespace CPF.Threading timeMre.Reset(); //Thread.Sleep(1); //Thread.SpinWait(10000); - //#if Net4 + //#if NET40 // var task = TaskEx.Delay(delay, cancellationTokenSource.Token); //#else // var task = Task.Delay(delay, cancellationTokenSource.Token); diff --git a/CPF/UIElement.cs b/CPF/UIElement.cs index 95c67cd..05efc51 100644 --- a/CPF/UIElement.cs +++ b/CPF/UIElement.cs @@ -3062,7 +3062,7 @@ namespace CPF /// /// -#if Net4 +#if NET40 public IList GetChildren() #else public IReadOnlyList GetChildren() diff --git a/CPF/UIElementCollection.cs b/CPF/UIElementCollection.cs index 631356d..80f0b63 100644 --- a/CPF/UIElementCollection.cs +++ b/CPF/UIElementCollection.cs @@ -10,7 +10,7 @@ namespace CPF /// 子元素集合 /// public class UIElementCollection : IEnumerable, IList, IList -#if Net4 +#if NET40 #else , IReadOnlyList #endif