Merge branch 'master' into master

src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs

@@ -4,7 +4,7 @@ namespace HandyControl.Data
     /// <summary>
     ///     标题对齐方式
     /// </summary>
-    public enum TitleAlignment
+    public enum TitlePlacementType
     {
         Left,
         Top

src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs

@@ -76,10 +76,8 @@ namespace HandyControl.Data
             {
                 FrameCount = 1;
             }
-            if (_frameDelay == null)
-            {
-                _frameDelay = new int[FrameCount];
-            }
+
+            _frameDelay ??= new int[FrameCount];
         }
 
         public int FrameDelay(int frame) => _frameDelay[frame];

src/Shared/HandyControl_Shared/Data/ResourceToken.cs

@@ -358,6 +358,18 @@
 
         internal const string TabItemCapsuleVerticalLast = nameof(TabItemCapsuleVerticalLast);
 
+        internal const string ComboBoxItemCapsuleDefault = nameof(ComboBoxItemCapsuleDefault);
+
+        internal const string ComboBoxItemCapsuleSingle = nameof(ComboBoxItemCapsuleSingle);
+
+        internal const string ComboBoxItemCapsuleHorizontalFirst = nameof(ComboBoxItemCapsuleHorizontalFirst);
+
+        internal const string ComboBoxItemCapsuleHorizontalLast = nameof(ComboBoxItemCapsuleHorizontalLast);
+
+        internal const string ComboBoxItemCapsuleVerticalFirst = nameof(ComboBoxItemCapsuleVerticalFirst);
+
+        internal const string ComboBoxItemCapsuleVerticalLast = nameof(ComboBoxItemCapsuleVerticalLast);
+
         #endregion
     }
 }