Merge branch 'develop'

fluentribbon · Sep 20, 2023 · 37cdf20 · 37cdf20
2 parents 1873919 + b427338
commit 37cdf20
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 162 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog for Fluent.Ribbon
 
+## 10.0.4
+
+- ### Bug fixes
+
+  - [#1165](../../issues/1165) - ScreenTip is not DPI aware
+
 ## 10.0.3
 
 - ### Bug fixes

diff --git a/Directory.packages.props b/Directory.packages.props
@@ -9,7 +9,7 @@
     </ItemGroup>
 
     <ItemGroup Label="Test">
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
         <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
 
         <PackageVersion Include="NUnit" version="3.13.3" />
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup Label="Build">
-        <PackageVersion Include="JetBrains.Annotations" version="2022.3.1" />
+        <PackageVersion Include="JetBrains.Annotations" version="2023.2.0" />
 
         <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.229-beta" />
         <PackageVersion Include="XAMLTools.MSBuild" version="1.0.0-alpha0143" />

diff --git a/Fluent.Ribbon/Controls/ApplicationMenu.cs b/Fluent.Ribbon/Controls/ApplicationMenu.cs
@@ -23,8 +23,8 @@ public class ApplicationMenu : DropDownButton
     /// </summary>
     public double RightPaneWidth
     {
-        get { return (double)this.GetValue(RightPaneWidthProperty); }
-        set { this.SetValue(RightPaneWidthProperty, value); }
+        get => (double)this.GetValue(RightPaneWidthProperty);
+        set => this.SetValue(RightPaneWidthProperty, value);
     }
 
     /// <summary>Identifies the <see cref="RightPaneWidth"/> dependency property.</summary>
@@ -35,8 +35,8 @@ public double RightPaneWidth
     /// </summary>
     public object? RightPaneContent
     {
-        get { return this.GetValue(RightPaneContentProperty); }
-        set { this.SetValue(RightPaneContentProperty, value); }
+        get => this.GetValue(RightPaneContentProperty);
+        set => this.SetValue(RightPaneContentProperty, value);
     }
 
     /// <summary>Identifies the <see cref="RightPaneContent"/> dependency property.</summary>
@@ -47,8 +47,8 @@ public object? RightPaneContent
     /// </summary>
     public object? FooterPaneContent
     {
-        get { return this.GetValue(FooterPaneContentProperty); }
-        set { this.SetValue(FooterPaneContentProperty, value); }
+        get => this.GetValue(FooterPaneContentProperty);
+        set => this.SetValue(FooterPaneContentProperty, value);
     }
 
     /// <summary>Identifies the <see cref="FooterPaneContent"/> dependency property.</summary>

diff --git a/Fluent.Ribbon/Controls/Backstage.cs b/Fluent.Ribbon/Controls/Backstage.cs
@@ -49,8 +49,8 @@ public class Backstage : RibbonControl
     /// </summary>
     public bool IsOpen
     {
-        get { return (bool)this.GetValue(IsOpenProperty); }
-        set { this.SetValue(IsOpenProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(IsOpenProperty);
+        set => this.SetValue(IsOpenProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="IsOpen"/> dependency property.</summary>
@@ -106,8 +106,8 @@ internal void SetIsOpen(bool isOpen)
     /// </summary>
     public bool CanChangeIsOpen
     {
-        get { return (bool)this.GetValue(CanChangeIsOpenProperty); }
-        set { this.SetValue(CanChangeIsOpenProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(CanChangeIsOpenProperty);
+        set => this.SetValue(CanChangeIsOpenProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="CanChangeIsOpen"/> dependency property.</summary>
@@ -119,8 +119,8 @@ public bool CanChangeIsOpen
     /// </summary>
     public bool HideContextTabsOnOpen
     {
-        get { return (bool)this.GetValue(HideContextTabsOnOpenProperty); }
-        set { this.SetValue(HideContextTabsOnOpenProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(HideContextTabsOnOpenProperty);
+        set => this.SetValue(HideContextTabsOnOpenProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="HideContextTabsOnOpen"/> dependency property.</summary>
@@ -132,8 +132,8 @@ public bool HideContextTabsOnOpen
     /// </summary>
     public bool AreAnimationsEnabled
     {
-        get { return (bool)this.GetValue(AreAnimationsEnabledProperty); }
-        set { this.SetValue(AreAnimationsEnabledProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(AreAnimationsEnabledProperty);
+        set => this.SetValue(AreAnimationsEnabledProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="AreAnimationsEnabled"/> dependency property.</summary>
@@ -145,8 +145,8 @@ public bool AreAnimationsEnabled
     /// </summary>
     public bool CloseOnEsc
     {
-        get { return (bool)this.GetValue(CloseOnEscProperty); }
-        set { this.SetValue(CloseOnEscProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(CloseOnEscProperty);
+        set => this.SetValue(CloseOnEscProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="CloseOnEsc"/> dependency property.</summary>
@@ -162,8 +162,8 @@ public bool CloseOnEsc
     /// </summary>
     public bool UseHighestAvailableAdornerLayer
     {
-        get { return (bool)this.GetValue(UseHighestAvailableAdornerLayerProperty); }
-        set { this.SetValue(UseHighestAvailableAdornerLayerProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(UseHighestAvailableAdornerLayerProperty);
+        set => this.SetValue(UseHighestAvailableAdornerLayerProperty, BooleanBoxes.Box(value));
     }
 
     #region Content
@@ -173,8 +173,8 @@ public bool UseHighestAvailableAdornerLayer
     /// </summary>
     public UIElement? Content
     {
-        get { return (UIElement?)this.GetValue(ContentProperty); }
-        set { this.SetValue(ContentProperty, value); }
+        get => (UIElement?)this.GetValue(ContentProperty);
+        set => this.SetValue(ContentProperty, value);
     }
 
     /// <summary>Identifies the <see cref="Content"/> dependency property.</summary>

diff --git a/Fluent.Ribbon/Controls/BackstageTabControl.cs b/Fluent.Ribbon/Controls/BackstageTabControl.cs
@@ -41,17 +41,17 @@ public class BackstageTabControl : Selector, ILogicalChildSupport
     /// </summary>
     public string? BackButtonUid
     {
-        get { return (string?)this.GetValue(BackButtonUidProperty); }
-        set { this.SetValue(BackButtonUidProperty, value); }
+        get => (string?)this.GetValue(BackButtonUidProperty);
+        set => this.SetValue(BackButtonUidProperty, value);
     }
 
     /// <summary>
     /// Gets or sets the margin which is used to render selected content.
     /// </summary>
     public Thickness SelectedContentMargin
     {
-        get { return (Thickness)this.GetValue(SelectedContentMarginProperty); }
-        set { this.SetValue(SelectedContentMarginProperty, value); }
+        get => (Thickness)this.GetValue(SelectedContentMarginProperty);
+        set => this.SetValue(SelectedContentMarginProperty, value);
     }
 
     /// <summary>Identifies the <see cref="SelectedContentMargin"/> dependency property.</summary>
@@ -70,8 +70,8 @@ public Thickness SelectedContentMargin
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public object? SelectedContent
     {
-        get { return this.GetValue(SelectedContentProperty); }
-        internal set { this.SetValue(SelectedContentPropertyKey, value); }
+        get => this.GetValue(SelectedContentProperty);
+        internal set => this.SetValue(SelectedContentPropertyKey, value);
     }
 
     /// <summary>Identifies the <see cref="ContentStringFormat"/> dependency property.</summary>
@@ -103,63 +103,39 @@ public object? SelectedContent
     /// </summary>
     public string? ContentStringFormat
     {
-        get
-        {
-            return (string?)this.GetValue(ContentStringFormatProperty);
-        }
+        get => (string?)this.GetValue(ContentStringFormatProperty);
 
-        set
-        {
-            this.SetValue(ContentStringFormatProperty, value);
-        }
+        set => this.SetValue(ContentStringFormatProperty, value);
     }
 
     /// <summary>
     /// Gets or sets the <see cref="DataTemplate"/> which should be used for the content
     /// </summary>
     public DataTemplate? ContentTemplate
     {
-        get
-        {
-            return (DataTemplate?)this.GetValue(ContentTemplateProperty);
-        }
+        get => (DataTemplate?)this.GetValue(ContentTemplateProperty);
 
-        set
-        {
-            this.SetValue(ContentTemplateProperty, value);
-        }
+        set => this.SetValue(ContentTemplateProperty, value);
     }
 
     /// <summary>
     /// Gets or sets the <see cref="ContentTemplateSelector"/> which should be used for the content
     /// </summary>
     public DataTemplateSelector? ContentTemplateSelector
     {
-        get
-        {
-            return (DataTemplateSelector?)this.GetValue(ContentTemplateSelectorProperty);
-        }
+        get => (DataTemplateSelector?)this.GetValue(ContentTemplateSelectorProperty);
 
-        set
-        {
-            this.SetValue(ContentTemplateSelectorProperty, value);
-        }
+        set => this.SetValue(ContentTemplateSelectorProperty, value);
     }
 
     /// <summary>
     /// Get or sets the string format for the selected content.
     /// </summary>
     public string? SelectedContentStringFormat
     {
-        get
-        {
-            return (string?)this.GetValue(SelectedContentStringFormatProperty);
-        }
+        get => (string?)this.GetValue(SelectedContentStringFormatProperty);
 
-        internal set
-        {
-            this.SetValue(SelectedContentStringFormatPropertyKey, value);
-        }
+        internal set => this.SetValue(SelectedContentStringFormatPropertyKey, value);
     }
 
     /// <summary>
@@ -168,15 +144,9 @@ internal set
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public DataTemplate? SelectedContentTemplate
     {
-        get
-        {
-            return (DataTemplate?)this.GetValue(SelectedContentTemplateProperty);
-        }
+        get => (DataTemplate?)this.GetValue(SelectedContentTemplateProperty);
 
-        internal set
-        {
-            this.SetValue(SelectedContentTemplatePropertyKey, value);
-        }
+        internal set => this.SetValue(SelectedContentTemplatePropertyKey, value);
     }
 
     /// <summary>
@@ -185,15 +155,9 @@ internal set
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public DataTemplateSelector? SelectedContentTemplateSelector
     {
-        get
-        {
-            return (DataTemplateSelector?)this.GetValue(SelectedContentTemplateSelectorProperty);
-        }
+        get => (DataTemplateSelector?)this.GetValue(SelectedContentTemplateSelectorProperty);
 
-        internal set
-        {
-            this.SetValue(SelectedContentTemplateSelectorPropertyKey, value);
-        }
+        internal set => this.SetValue(SelectedContentTemplateSelectorPropertyKey, value);
     }
 
     #region ItemsPanelMinWidth
@@ -206,8 +170,8 @@ internal set
     /// </summary>
     public double ItemsPanelMinWidth
     {
-        get { return (double)this.GetValue(ItemsPanelMinWidthProperty); }
-        set { this.SetValue(ItemsPanelMinWidthProperty, value); }
+        get => (double)this.GetValue(ItemsPanelMinWidthProperty);
+        set => this.SetValue(ItemsPanelMinWidthProperty, value);
     }
 
     #endregion
@@ -219,8 +183,8 @@ public double ItemsPanelMinWidth
     /// </summary>
     public Brush? ItemsPanelBackground
     {
-        get { return (Brush?)this.GetValue(ItemsPanelBackgroundProperty); }
-        set { this.SetValue(ItemsPanelBackgroundProperty, value); }
+        get => (Brush?)this.GetValue(ItemsPanelBackgroundProperty);
+        set => this.SetValue(ItemsPanelBackgroundProperty, value);
     }
 
     /// <summary>Identifies the <see cref="ItemsPanelBackground"/> dependency property.</summary>
@@ -235,8 +199,8 @@ public Brush? ItemsPanelBackground
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public Backstage? ParentBackstage
     {
-        get { return (Backstage?)this.GetValue(ParentBackstageProperty); }
-        set { this.SetValue(ParentBackstageProperty, value); }
+        get => (Backstage?)this.GetValue(ParentBackstageProperty);
+        set => this.SetValue(ParentBackstageProperty, value);
     }
 
     /// <summary>Identifies the <see cref="ParentBackstage"/> dependency property.</summary>
@@ -248,8 +212,8 @@ public Backstage? ParentBackstage
     /// </summary>
     public bool IsWindowSteeringHelperEnabled
     {
-        get { return (bool)this.GetValue(IsWindowSteeringHelperEnabledProperty); }
-        set { this.SetValue(IsWindowSteeringHelperEnabledProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(IsWindowSteeringHelperEnabledProperty);
+        set => this.SetValue(IsWindowSteeringHelperEnabledProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="IsWindowSteeringHelperEnabled"/> dependency property.</summary>
@@ -261,8 +225,8 @@ public bool IsWindowSteeringHelperEnabled
     /// </summary>
     public bool IsBackButtonVisible
     {
-        get { return (bool)this.GetValue(IsBackButtonVisibleProperty); }
-        set { this.SetValue(IsBackButtonVisibleProperty, BooleanBoxes.Box(value)); }
+        get => (bool)this.GetValue(IsBackButtonVisibleProperty);
+        set => this.SetValue(IsBackButtonVisibleProperty, BooleanBoxes.Box(value));
     }
 
     /// <summary>Identifies the <see cref="IsBackButtonVisible"/> dependency property.</summary>