1.2.1

Panuon · Mar 18, 2024 · 604aa50 · 604aa50
1 parent c7269ed
commit 604aa50
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/MenuStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/MenuStyle.xaml
@@ -82,6 +82,8 @@
                 Value="BottomRight" />
         <Setter Property="local:DropDownHelper.VerticalOffset"
                 Value="0" />
+        <Setter Property="local:DropDownHelper.Width"
+                Value="150" />
         <Setter Property="local:MenuHelper.TopLevelDropDownPlacement"
                 Value="{Binding Path=(local:DropDownHelper.Placement), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:MenuHelper.TopLevelDropDownVerticalOffset"

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.0.2")]
-[assembly: AssemblyFileVersion("1.2.0.2")]
+[assembly: AssemblyVersion("1.2.1")]
+[assembly: AssemblyFileVersion("1.2.1")]
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/KeyOnlyStyleDictionary.cs
@@ -12,11 +12,12 @@ protected override void SetIncludeStyles()
 
             foreach (var flag in Flags)
             {
-                if (Includes.HasFlag(StyleDictionaryFlags.All) || Includes.HasFlag(flag))
+                if (Includes.HasFlag(StyleDictionaryFlags.All) 
+                    || Includes.HasFlag(flag))
                 {
-                    MergedDictionaries.Add(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Style.xaml") });
+                    AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Style.xaml") });
                 }
             }
         }
     }
-}
+}
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionary.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace Panuon.WPF.UI.Resources
 {
@@ -13,24 +12,31 @@ protected override void SetIncludeStyles()
 
             foreach (var flag in Flags)
             {
-                if (Includes.HasFlag(StyleDictionaryFlags.All) || Includes.HasFlag(flag))
+                if (Includes.HasFlag(StyleDictionaryFlags.All) 
+                    || Includes.HasFlag(flag))
                 {
-                    MergedDictionaries.Add(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}.xaml") });
+                    AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}.xaml") });
 
-                    switch (flag) 
+                    switch (flag)
                     {
                         case StyleDictionaryFlags.ComboBox:
                         case StyleDictionaryFlags.ListBox:
                         case StyleDictionaryFlags.ListView:
                         case StyleDictionaryFlags.TreeView:
-                            MergedDictionaries.Add(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Item.xaml") });
+                        case StyleDictionaryFlags.Menu:
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/{flag}Item.xaml") });
                             break;
                         case StyleDictionaryFlags.TabControl:
-                            MergedDictionaries.Add(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItem.xaml") });
+                            AddToMergedDictionaries(new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItem.xaml") });
+                            break;
+                        case StyleDictionaryFlags.ContextMenu:
+                            var contextMenuItemDic = new SharedResourceDictionary() { Source = new Uri($"pack://application:,,,/Panuon.WPF.UI;component/Styles/MenuItem.xaml") };
+                            AddToMergedDictionaries(contextMenuItemDic);
                             break;
                     }
                 }
             }
         }
+
     }
-}
+}
diff --git a/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs b/SourceCode/sharedResources/Panuon.WPF.UI/Resources/StyleDictionaryBase.cs
@@ -45,6 +45,14 @@ public StyleDictionaryFlags Includes
 
         #region Methods
         protected abstract void SetIncludeStyles();
+
+        protected void AddToMergedDictionaries(ResourceDictionary dictionary)
+        {
+            if (!MergedDictionaries.Contains(dictionary))
+            {
+                MergedDictionaries.Add(dictionary);
+            }
+        }
         #endregion
     }
-}
+}