1.2.1.1

Panuon · Mar 28, 2024 · 7cc3199 · 7cc3199
1 parent 604aa50
commit 7cc3199
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ContextMenuItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ContextMenuItemTemplate.xaml
@@ -241,7 +241,7 @@
                 <DataTrigger.Binding>
                     <MultiBinding Converter="{x:Static irs:Converters.IsItemSeparatorShallVisibleControlConverter}">
                         <Binding Path="."
-                                 RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
+                                 RelativeSource="{RelativeSource AncestorType=ContextMenu}" />
                         <Binding Path="."
                                  RelativeSource="{RelativeSource Self}" />
                     </MultiBinding>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/MenuItemTemplate.xaml
@@ -203,7 +203,7 @@
                 <DataTrigger.Binding>
                     <MultiBinding Converter="{x:Static irs:Converters.IsItemSeparatorShallVisibleControlConverter}">
                         <Binding Path="."
-                                 RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
+                                 RelativeSource="{RelativeSource AncestorType=Menu}" />
                         <Binding Path="."
                                  RelativeSource="{RelativeSource Self}" />
                     </MultiBinding>
@@ -616,7 +616,7 @@
                 <DataTrigger.Binding>
                     <MultiBinding Converter="{x:Static irs:Converters.IsItemSeparatorShallVisibleControlConverter}">
                         <Binding Path="."
-                                 RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
+                                 RelativeSource="{RelativeSource AncestorType=Menu}" />
                         <Binding Path="."
                                  RelativeSource="{RelativeSource Self}" />
                     </MultiBinding>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Utils/CursorUtil.cs b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Utils/CursorUtil.cs
@@ -13,7 +13,7 @@ public static Cursor DropperCursor
             {
                 if(_dropperCursor == null)
                 {
-                    var info = Application.GetResourceStream(new Uri("/Panuon.WPF;component/Resources/dropper.cur", UriKind.Relative));
+                    var info = Application.GetResourceStream(new Uri("/Panuon.WPF.UI;component/Resources/dropper.cur", UriKind.Relative));
 #if NET452
                     _dropperCursor = new Cursor(info.Stream);
 #else

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Controls/ThumbFence.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Controls/ThumbFence.cs
@@ -139,10 +139,8 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
             {
                 return;
             }
-            var hwndSource = PresentationSource.FromVisual(this) as HwndSource;
-            var source = hwndSource.CompositionTarget.TransformToDevice;
             var mousePosition = e.GetPosition(_canvas);
-            var position = new Point(mousePosition.X / source.M11 / renderWidth, mousePosition.Y / source.M22 / renderHeight);
+            var position = new Point(mousePosition.X / renderWidth, mousePosition.Y / renderHeight);
 
             var args = new PositionChangingRoutedEventArgs(ThumbPositionChangingEvent, position);
             RaiseEvent(args);
@@ -208,10 +206,8 @@ private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
             {
                 return;
             }
-            var hwndSource = PresentationSource.FromVisual(this) as HwndSource;
-            var source = hwndSource.CompositionTarget.TransformToDevice;
             var mousePosition = Mouse.GetPosition(this);
-            var position = new Point(mousePosition.X / source.M11 / renderWidth, mousePosition.Y / source.M22 / renderHeight);
+            var position = new Point(mousePosition.X / renderWidth, mousePosition.Y / renderHeight);
 
             var args = new PositionChangingRoutedEventArgs(ThumbPositionChangingEvent, position);
             RaiseEvent(args);

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs b/SourceCode/SharedResources/Panuon.WPF.UI/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
     ResourceDictionaryLocation.SourceAssembly
 )]
 
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.1.1")]
+[assembly: AssemblyFileVersion("1.2.1.1")]
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Enums/StyleDictionaryFlags.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Enums/StyleDictionaryFlags.cs
@@ -31,6 +31,7 @@ public enum StyleDictionaryFlags
         TextBox = 2097152,
         Thumb = 4194304,
         ToggleButton = 8388608,
-        TreeView = 16777216,
+        ToolTip = 16777216,
+        TreeView = 33554432,
     }
 }