From 5805df4d65d99d7c251f1dc996f27432a2d9bc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BA=A2=E5=B8=BD?= <761716178@qq.com> Date: Fri, 24 Nov 2023 14:11:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=A7=E6=89=BF=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=92=8CWindows=E8=A7=A6=E6=91=B8=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CPF.Windows/UnmanagedMethods.cs | 1 + CPF.Windows/WindowImpl.cs | 121 +++++++++++++++++++------------- CPF/BindingDescribe.cs | 9 ++- CPF/Controls/DataGridCell.cs | 19 +++++ CPF/Controls/View.cs | 1 + CPF/CpfObject.cs | 37 +++++++++- CPF/Design/DesignWindow.cs | 1 - CPF/LayoutManager.cs | 2 +- CPF/UIElement.cs | 47 +++++++++---- 9 files changed, 171 insertions(+), 67 deletions(-) diff --git a/CPF.Windows/UnmanagedMethods.cs b/CPF.Windows/UnmanagedMethods.cs index 8d34984..07982fe 100644 --- a/CPF.Windows/UnmanagedMethods.cs +++ b/CPF.Windows/UnmanagedMethods.cs @@ -657,6 +657,7 @@ namespace CPF.Windows WM_USER = 0x0400, WM_DISPATCH_WORK_ITEM = WM_USER, WM_TOUCH = 0x0240, + WM_GESTURE = 0x0119, //WM_PARENTNOTIFY = 0x0210, WM_NCPOINTERUPDATE = 0x0241, WM_NCPOINTERDOWN = 0x0242, diff --git a/CPF.Windows/WindowImpl.cs b/CPF.Windows/WindowImpl.cs index 2818d40..400b7b2 100644 --- a/CPF.Windows/WindowImpl.cs +++ b/CPF.Windows/WindowImpl.cs @@ -74,6 +74,7 @@ namespace CPF.Windows } WNDCLASSEX wc = new WNDCLASSEX(); + bool touchMsg; public WindowImpl() { if (Window == null) @@ -89,6 +90,10 @@ namespace CPF.Windows { isLayered = true; } + if ((v.Major == 6 && v.Minor < 2)) + { + touchMsg = RegisterTouchWindow(handle, RegisterTouchFlags.TWF_NONE); + } _className = "CPFWindow-" + Guid.NewGuid(); // 初始化窗口类结构 wc.cbSize = Marshal.SizeOf(typeof(WNDCLASSEX)); @@ -707,60 +712,83 @@ namespace CPF.Windows case WindowsMessage.WM_POINTERDOWN: case WindowsMessage.WM_POINTERUP: case WindowsMessage.WM_POINTERUPDATE: - var id = GetPointerId(wParam); - var position = GetPointerLocation(lParam); - position = PointToClient(position); - //Debug.WriteLine("id:" + id + " " + position); - POINTER_INFO pi = new POINTER_INFO(); - if (GetPointerInfo(id, ref pi)) + if (!touchMsg) { - switch ((WindowsMessage)msg) + var id = GetPointerId(wParam); + var position = GetPointerLocation(lParam); + position = PointToClient(position); + //Debug.WriteLine("id:" + id + " " + position); + POINTER_INFO pi = new POINTER_INFO(); + if (GetPointerInfo(id, ref pi)) { - case WindowsMessage.WM_POINTERDOWN: - //Debug.WriteLine("down"); - root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchDown); - break; - case WindowsMessage.WM_POINTERUP: - //Debug.WriteLine("up"); - root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchUp); - //root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchLeave); - break; - case WindowsMessage.WM_POINTERUPDATE: - //Debug.WriteLine("update"); - root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchMove); - break; + switch ((WindowsMessage)msg) + { + case WindowsMessage.WM_POINTERDOWN: + //Debug.WriteLine("down"); + root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchDown); + break; + case WindowsMessage.WM_POINTERUP: + //Debug.WriteLine("up"); + root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchUp); + //root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchLeave); + break; + case WindowsMessage.WM_POINTERUPDATE: + //Debug.WriteLine("update"); + root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint { Id = id, Position = position }, root.InputManager.TouchDevice, Root), root.LayoutManager.VisibleUIElements, EventType.TouchMove); + break; + } } } break; case WindowsMessage.WM_POINTERWHEEL: Debug.WriteLine("WM_POINTERWHEEL"); break; - //case WindowsMessage.WM_TOUCH: - // { - // var touchInputCount = wParam.ToInt32(); - // var pTouchInputs = stackalloc TOUCHINPUT[touchInputCount]; - // if (GetTouchInputInfo(lParam, (uint)touchInputCount, pTouchInputs, Marshal.SizeOf(typeof(TOUCHINPUT)))) - // { - // for (int i = 0; i < touchInputCount; i++) - // { - // var touchInput = pTouchInputs[i]; + case WindowsMessage.WM_GESTURE: + Debug.WriteLine("WM_GESTURE"); + break; + case WindowsMessage.WM_TOUCH: + if (touchMsg) + { + var touchInputCount = wParam.ToInt32(); + var pTouchInputs = stackalloc TOUCHINPUT[touchInputCount]; + if (GetTouchInputInfo(lParam, (uint)touchInputCount, pTouchInputs, Marshal.SizeOf(typeof(TOUCHINPUT)))) + { + for (int i = 0; i < touchInputCount; i++) + { + var input = pTouchInputs[i]; - // //Input?.Invoke(new RawTouchEventArgs(_touchDevice, touchInput.Time, - // // _owner, - // // touchInput.Flags.HasAllFlags(TouchInputFlags.TOUCHEVENTF_UP) ? - // // RawPointerEventType.TouchEnd : - // // touchInput.Flags.HasAllFlags(TouchInputFlags.TOUCHEVENTF_DOWN) ? - // // RawPointerEventType.TouchBegin : - // // RawPointerEventType.TouchUpdate, - // // PointToClient(new PixelPoint(touchInput.X / 100, touchInput.Y / 100)), - // // WindowsKeyboardDevice.Instance.Modifiers, - // // touchInput.Id)); - // } - // CloseTouchInputHandle(lParam); - // return IntPtr.Zero; - // } - // break; - // } + if ((input.Flags & TouchInputFlags.TOUCHEVENTF_DOWN) > 0) + { + Root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint + { + Id = (int)input.Id, + Position = new Point((float)(input.X * 0.01), (float)(input.Y * 0.01)) + }, Root.InputManager.TouchDevice, Root), Root.LayoutManager.VisibleUIElements, EventType.TouchDown); + + } + else if ((input.Flags & TouchInputFlags.TOUCHEVENTF_UP) > 0) + { + Root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint + { + Id = (int)input.Id, + Position = new Point((float)(input.X * 0.01), (float)(input.Y * 0.01)) + }, Root.InputManager.TouchDevice, Root), Root.LayoutManager.VisibleUIElements, EventType.TouchUp); + + } + else if ((input.Flags & TouchInputFlags.TOUCHEVENTF_MOVE) > 0) + { + Root.InputManager.TouchDevice.ProcessEvent(new TouchEventArgs(new TouchPoint + { + Id = (int)input.Id, + Position = new Point((float)(input.X * 0.01), (float)(input.Y * 0.01)) + }, Root.InputManager.TouchDevice, Root), Root.LayoutManager.VisibleUIElements, EventType.TouchMove); + } + } + CloseTouchInputHandle(lParam); + return IntPtr.Zero; + } + } + break; case UnmanagedMethods.WindowsMessage.WM_CLOSE: bool? preventClosing = Closing?.Invoke(); if (preventClosing == true) @@ -1523,7 +1551,7 @@ namespace CPF.Windows } invalidateRect.Intersect(all);//最后失效区域为在控件区域里面的相交区域 } - if (!paint && (timer == null ))//&& isLayered + if (!paint && (timer == null))//&& isLayered { paint = true; BeginInvoke(a => @@ -1692,7 +1720,6 @@ namespace CPF.Windows public void SetVisible(bool visible) { //var v = IsWindowVisible(handle); - root.InputManager.TouchDevice.ClearPoints(); if (visible) { if (windowState == WindowState.Normal) diff --git a/CPF/BindingDescribe.cs b/CPF/BindingDescribe.cs index a7346d8..75585a0 100644 --- a/CPF/BindingDescribe.cs +++ b/CPF/BindingDescribe.cs @@ -330,7 +330,14 @@ namespace CPF } return b; } - + //public static BindingDescribe operator *(BindingDescribe property1, string property2) + //{ + // return null; + //} + //public static BindingDescribe operator *(BindingDescribe property1, BindingDescribe property2) + //{ + // return null; + //} public BindingMode BindingMode { get; set; } = BindingMode.OneWay; public object Source { get; set; } diff --git a/CPF/Controls/DataGridCell.cs b/CPF/Controls/DataGridCell.cs index 67b701f..f12784e 100644 --- a/CPF/Controls/DataGridCell.cs +++ b/CPF/Controls/DataGridCell.cs @@ -149,6 +149,25 @@ namespace CPF.Controls { base.OnOverrideMetadata(overridePropertys); overridePropertys.Override(nameof(Height), new UIPropertyMetadataAttribute((FloatField)"100%", UIPropertyOptions.AffectsMeasure)); + //overridePropertys.Override(nameof(DataContext), new UIPropertyMetadataAttribute(null, false)); } + + //protected override void OnLayoutUpdated() + //{ + // base.OnLayoutUpdated(); + // if (Root.LayoutManager.IsVisible(this)) + // { + // DataContext = Row.DataContext; + // } + //} + + //protected override void OnPropertyChanged(string propertyName, object oldValue, object newValue, PropertyMetadataAttribute propertyMetadata) + //{ + // if (propertyName == nameof(DataContext)) + // { + + // } + // base.OnPropertyChanged(propertyName, oldValue, newValue, propertyMetadata); + //} } } diff --git a/CPF/Controls/View.cs b/CPF/Controls/View.cs index 10c2365..876fba9 100644 --- a/CPF/Controls/View.cs +++ b/CPF/Controls/View.cs @@ -860,6 +860,7 @@ namespace CPF.Controls base.OnPropertyChanged(propertyName, oldValue, newValue, propertyMetadata); if (propertyName == nameof(Visibility)) { + InputManager.TouchDevice.ClearPoints(); viewImpl.SetVisible((Visibility)newValue == Visibility.Visible); } if (!onChecked && radioButtonGroupProperty != null && radiobuttons != null && radioButtonGroupProperty.TryGetValue(propertyName, out var group)) diff --git a/CPF/CpfObject.cs b/CPF/CpfObject.cs index 3c0f928..0c850cf 100644 --- a/CPF/CpfObject.cs +++ b/CPF/CpfObject.cs @@ -24,17 +24,20 @@ namespace CPF static ConcurrentDictionary typeCache = new ConcurrentDictionary(); static ConcurrentDictionary typePropertyCache = new ConcurrentDictionary(); static ConcurrentDictionary> inheritsProperties = new ConcurrentDictionary>(); + static ConcurrentDictionary> breakInheritsProperties = new ConcurrentDictionary>(); static ConcurrentDictionary> propertyChangedMethods = new ConcurrentDictionary>(); static KeyValuePair[] saveTypeCache; static KeyValuePair[] saveTypePropertyCache; static KeyValuePair>[] saveInheritsProperties; + static KeyValuePair>[] saveBreakInheritsProperties; static KeyValuePair>[] savePropertyChangedMethods; public static void SetTypeCache() { saveTypeCache = typeCache.ToArray(); saveTypePropertyCache = typePropertyCache.ToArray(); saveInheritsProperties = inheritsProperties.ToArray(); + saveBreakInheritsProperties = breakInheritsProperties.ToArray(); FastReflectionExtensions.SetTypeCache(); savePropertyChangedMethods = propertyChangedMethods.ToArray(); } @@ -67,6 +70,15 @@ namespace CPF } saveInheritsProperties = null; } + if (saveBreakInheritsProperties != null) + { + breakInheritsProperties.Clear(); + foreach (var item in saveBreakInheritsProperties) + { + breakInheritsProperties.TryAdd(item.Key, item.Value); + } + saveBreakInheritsProperties = null; + } if (savePropertyChangedMethods != null) { propertyChangedMethods.Clear(); @@ -87,9 +99,13 @@ namespace CPF internal HybridDictionary attachedValues; /// - /// 继承属性的特性 + /// 继承属性，不同继承类型分支下来的属性名可能相同但是属性ID不同，只能保存属性名 /// internal HashSet inheritsPropertyName; + /// + /// 终止继承属性，不同继承类型分支下来的属性名可能相同但是属性ID不同，只能保存属性名 + /// + internal HashSet breakInheritsPropertyName; AttachedProperties attached; /// @@ -326,18 +342,31 @@ namespace CPF typePropertyCache.TryAdd(type, propertyList.ToArray()); var l = new HashSet(); + var b = new HashSet(); foreach (var item in objInfo) { - if (item.Value is UIPropertyMetadataAttribute attribute && attribute.Inherits) + if (item.Value is UIPropertyMetadataAttribute attribute) { - l.Add(attribute.PropertyName); + if (attribute.Inherits) + { + l.Add(attribute.PropertyName); + } + else + { + b.Add(attribute.PropertyName); + } } } if (l.Count == 0) { l = null; } + if (b.Count == 0) + { + b = null; + } inheritsProperties.TryAdd(type, l); + breakInheritsProperties.TryAdd(type, b); //Type tt = typeof(PropertyChangedAttribute); //var ms = type.FindMembers(MemberTypes.Method, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, (a, b) => a.CustomAttributes.Any(c => c.AttributeType == tt), null); @@ -443,6 +472,8 @@ namespace CPF //valueIndexs = new ByteArray((byte)objInfo.Count); valueIndexs = new byte[objInfo.Count]; inheritsPropertyName = inheritsProperties[type]; + breakInheritsPropertyName = breakInheritsProperties[type]; + if (objInfo.Computed != null) { foreach (var item in objInfo.Computed) diff --git a/CPF/Design/DesignWindow.cs b/CPF/Design/DesignWindow.cs index e960de9..a6ec2fc 100644 --- a/CPF/Design/DesignWindow.cs +++ b/CPF/Design/DesignWindow.cs @@ -213,7 +213,6 @@ namespace CPF.Design public void SetVisible(bool visible) { - root.InputManager.TouchDevice.ClearPoints(); root.LayoutManager.ExecuteLayoutPass(); root.Invalidate(); } diff --git a/CPF/LayoutManager.cs b/CPF/LayoutManager.cs index c9968e9..2797239 100644 --- a/CPF/LayoutManager.cs +++ b/CPF/LayoutManager.cs @@ -99,7 +99,7 @@ namespace CPF { if (item.IsDisposed) { - break; + continue; } var rect = GetRect(item.Parent, item.GetContentBounds(), item); rect.Intersect(new Rect(new Point(), item.ActualSize)); diff --git a/CPF/UIElement.cs b/CPF/UIElement.cs index e380a79..51b616a 100644 --- a/CPF/UIElement.cs +++ b/CPF/UIElement.cs @@ -1372,29 +1372,41 @@ namespace CPF } } } - + /// + /// 继承属性需要一级级传递，直到没有元素或者取消继承为止 + /// + /// + /// + /// + /// void Inherits(UIElement element, string propertyName, object oldValue, object newValue) { if (!element.HasLocalOrStyleValue(propertyName, out var p)) { - element.inheritsSet = true; //var p = element.GetPropertyMetadata(propertyName); - if (p != null) + + var ui = p as UIPropertyMetadataAttribute; + if (ui != null && ui.Inherits) { - if (p is UIPropertyMetadataAttribute ui && ui.Inherits) - { - element.inheritsValues.Remove(propertyName); - element.inheritsValues.Add(propertyName, new InheritsValue { Value = newValue, ValueForm = ValueFrom.Property }); - } + element.inheritsSet = true; + element.inheritsValues.Remove(propertyName); + element.inheritsValues.Add(propertyName, new InheritsValue { Value = newValue, ValueForm = ValueFrom.Property }); element.OnPropertyChanged(propertyName, oldValue, newValue, p); + element.inheritsSet = false; + for (int i = 0; i < element.Children.Count; i++) + { + Inherits(element.children[i], propertyName, oldValue, newValue); + } + } + else if (ui == null) + { + for (int i = 0; i < element.Children.Count; i++) + { + Inherits(element.children[i], propertyName, oldValue, newValue); + } } - element.inheritsSet = false; //if (propertyName != nameof(DataContext) || !element.HasLocalOrStyleValue(propertyName, out p)) //{ - for (int i = 0; i < element.Children.Count; i++) - { - Inherits(element.children[i], propertyName, oldValue, newValue); - } //} } } @@ -2480,6 +2492,9 @@ namespace CPF viewRenderRect = true; } } + /// + /// 是否需要更新渲染区域 + /// [NotCpfProperty] internal bool viewRenderRect { get { return GetFlag(CoreFlags.viewRenderRect); } set { SetFlag(CoreFlags.viewRenderRect, value); } } //protected virtual void ArrangeCore(in Rect finalRect) @@ -3441,7 +3456,7 @@ namespace CPF } break; } - else if (p.HasLocalOrStyleValue(item, out _)) + else if (p.HasLocalOrStyleValue(item, out var pa)) { var value = p.GetValue(item); var old = GetValue(item); @@ -3457,6 +3472,10 @@ namespace CPF } } } + if (p.breakInheritsPropertyName != null && p.breakInheritsPropertyName.Contains(item)) + { + break; + } p = p.Parent; } }