Skip to content

Commit 37cdf20

Browse files
batzenbatzen
committed
Merge branch 'develop'
2 parents 1873919 + b427338 commit 37cdf20

File tree

10 files changed

+139
-162
lines changed

10 files changed

+139
-162
lines changed

‎Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog for Fluent.Ribbon
22

3+
## 10.0.4
4+
5+
- ### Bug fixes
6+
7+
- [#1165](../../issues/1165) - ScreenTip is not DPI aware
8+
39
## 10.0.3
410

511
- ### Bug fixes

‎Directory.packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup Label="Test">
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
1313
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
1414

1515
<PackageVersion Include="NUnit" version="3.13.3" />
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Label="Build">
21-
<PackageVersion Include="JetBrains.Annotations" version="2022.3.1" />
21+
<PackageVersion Include="JetBrains.Annotations" version="2023.2.0" />
2222

2323
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.229-beta" />
2424
<PackageVersion Include="XAMLTools.MSBuild" version="1.0.0-alpha0143" />

‎Fluent.Ribbon/Controls/ApplicationMenu.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public class ApplicationMenu : DropDownButton
2323
/// </summary>
2424
public double RightPaneWidth
2525
{
26-
get { return (double)this.GetValue(RightPaneWidthProperty); }
27-
set { this.SetValue(RightPaneWidthProperty, value); }
26+
get => (double)this.GetValue(RightPaneWidthProperty);
27+
set => this.SetValue(RightPaneWidthProperty, value);
2828
}
2929

3030
/// <summary>Identifies the <see cref="RightPaneWidth"/> dependency property.</summary>
@@ -35,8 +35,8 @@ public double RightPaneWidth
3535
/// </summary>
3636
public object? RightPaneContent
3737
{
38-
get { return this.GetValue(RightPaneContentProperty); }
39-
set { this.SetValue(RightPaneContentProperty, value); }
38+
get => this.GetValue(RightPaneContentProperty);
39+
set => this.SetValue(RightPaneContentProperty, value);
4040
}
4141

4242
/// <summary>Identifies the <see cref="RightPaneContent"/> dependency property.</summary>
@@ -47,8 +47,8 @@ public object? RightPaneContent
4747
/// </summary>
4848
public object? FooterPaneContent
4949
{
50-
get { return this.GetValue(FooterPaneContentProperty); }
51-
set { this.SetValue(FooterPaneContentProperty, value); }
50+
get => this.GetValue(FooterPaneContentProperty);
51+
set => this.SetValue(FooterPaneContentProperty, value);
5252
}
5353

5454
/// <summary>Identifies the <see cref="FooterPaneContent"/> dependency property.</summary>

‎Fluent.Ribbon/Controls/Backstage.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public class Backstage : RibbonControl
4949
/// </summary>
5050
public bool IsOpen
5151
{
52-
get { return (bool)this.GetValue(IsOpenProperty); }
53-
set { this.SetValue(IsOpenProperty, BooleanBoxes.Box(value)); }
52+
get => (bool)this.GetValue(IsOpenProperty);
53+
set => this.SetValue(IsOpenProperty, BooleanBoxes.Box(value));
5454
}
5555

5656
/// <summary>Identifies the <see cref="IsOpen"/> dependency property.</summary>
@@ -106,8 +106,8 @@ internal void SetIsOpen(bool isOpen)
106106
/// </summary>
107107
public bool CanChangeIsOpen
108108
{
109-
get { return (bool)this.GetValue(CanChangeIsOpenProperty); }
110-
set { this.SetValue(CanChangeIsOpenProperty, BooleanBoxes.Box(value)); }
109+
get => (bool)this.GetValue(CanChangeIsOpenProperty);
110+
set => this.SetValue(CanChangeIsOpenProperty, BooleanBoxes.Box(value));
111111
}
112112

113113
/// <summary>Identifies the <see cref="CanChangeIsOpen"/> dependency property.</summary>
@@ -119,8 +119,8 @@ public bool CanChangeIsOpen
119119
/// </summary>
120120
public bool HideContextTabsOnOpen
121121
{
122-
get { return (bool)this.GetValue(HideContextTabsOnOpenProperty); }
123-
set { this.SetValue(HideContextTabsOnOpenProperty, BooleanBoxes.Box(value)); }
122+
get => (bool)this.GetValue(HideContextTabsOnOpenProperty);
123+
set => this.SetValue(HideContextTabsOnOpenProperty, BooleanBoxes.Box(value));
124124
}
125125

126126
/// <summary>Identifies the <see cref="HideContextTabsOnOpen"/> dependency property.</summary>
@@ -132,8 +132,8 @@ public bool HideContextTabsOnOpen
132132
/// </summary>
133133
public bool AreAnimationsEnabled
134134
{
135-
get { return (bool)this.GetValue(AreAnimationsEnabledProperty); }
136-
set { this.SetValue(AreAnimationsEnabledProperty, BooleanBoxes.Box(value)); }
135+
get => (bool)this.GetValue(AreAnimationsEnabledProperty);
136+
set => this.SetValue(AreAnimationsEnabledProperty, BooleanBoxes.Box(value));
137137
}
138138

139139
/// <summary>Identifies the <see cref="AreAnimationsEnabled"/> dependency property.</summary>
@@ -145,8 +145,8 @@ public bool AreAnimationsEnabled
145145
/// </summary>
146146
public bool CloseOnEsc
147147
{
148-
get { return (bool)this.GetValue(CloseOnEscProperty); }
149-
set { this.SetValue(CloseOnEscProperty, BooleanBoxes.Box(value)); }
148+
get => (bool)this.GetValue(CloseOnEscProperty);
149+
set => this.SetValue(CloseOnEscProperty, BooleanBoxes.Box(value));
150150
}
151151

152152
/// <summary>Identifies the <see cref="CloseOnEsc"/> dependency property.</summary>
@@ -162,8 +162,8 @@ public bool CloseOnEsc
162162
/// </summary>
163163
public bool UseHighestAvailableAdornerLayer
164164
{
165-
get { return (bool)this.GetValue(UseHighestAvailableAdornerLayerProperty); }
166-
set { this.SetValue(UseHighestAvailableAdornerLayerProperty, BooleanBoxes.Box(value)); }
165+
get => (bool)this.GetValue(UseHighestAvailableAdornerLayerProperty);
166+
set => this.SetValue(UseHighestAvailableAdornerLayerProperty, BooleanBoxes.Box(value));
167167
}
168168

169169
#region Content
@@ -173,8 +173,8 @@ public bool UseHighestAvailableAdornerLayer
173173
/// </summary>
174174
public UIElement? Content
175175
{
176-
get { return (UIElement?)this.GetValue(ContentProperty); }
177-
set { this.SetValue(ContentProperty, value); }
176+
get => (UIElement?)this.GetValue(ContentProperty);
177+
set => this.SetValue(ContentProperty, value);
178178
}
179179

180180
/// <summary>Identifies the <see cref="Content"/> dependency property.</summary>

‎Fluent.Ribbon/Controls/BackstageTabControl.cs

Lines changed: 28 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ public class BackstageTabControl : Selector, ILogicalChildSupport
4141
/// </summary>
4242
public string? BackButtonUid
4343
{
44-
get { return (string?)this.GetValue(BackButtonUidProperty); }
45-
set { this.SetValue(BackButtonUidProperty, value); }
44+
get => (string?)this.GetValue(BackButtonUidProperty);
45+
set => this.SetValue(BackButtonUidProperty, value);
4646
}
4747

4848
/// <summary>
4949
/// Gets or sets the margin which is used to render selected content.
5050
/// </summary>
5151
public Thickness SelectedContentMargin
5252
{
53-
get { return (Thickness)this.GetValue(SelectedContentMarginProperty); }
54-
set { this.SetValue(SelectedContentMarginProperty, value); }
53+
get => (Thickness)this.GetValue(SelectedContentMarginProperty);
54+
set => this.SetValue(SelectedContentMarginProperty, value);
5555
}
5656

5757
/// <summary>Identifies the <see cref="SelectedContentMargin"/> dependency property.</summary>
@@ -70,8 +70,8 @@ public Thickness SelectedContentMargin
7070
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
7171
public object? SelectedContent
7272
{
73-
get { return this.GetValue(SelectedContentProperty); }
74-
internal set { this.SetValue(SelectedContentPropertyKey, value); }
73+
get => this.GetValue(SelectedContentProperty);
74+
internal set => this.SetValue(SelectedContentPropertyKey, value);
7575
}
7676

7777
/// <summary>Identifies the <see cref="ContentStringFormat"/> dependency property.</summary>
@@ -103,63 +103,39 @@ public object? SelectedContent
103103
/// </summary>
104104
public string? ContentStringFormat
105105
{
106-
get
107-
{
108-
return (string?)this.GetValue(ContentStringFormatProperty);
109-
}
106+
get => (string?)this.GetValue(ContentStringFormatProperty);
110107

111-
set
112-
{
113-
this.SetValue(ContentStringFormatProperty, value);
114-
}
108+
set => this.SetValue(ContentStringFormatProperty, value);
115109
}
116110

117111
/// <summary>
118112
/// Gets or sets the <see cref="DataTemplate"/> which should be used for the content
119113
/// </summary>
120114
public DataTemplate? ContentTemplate
121115
{
122-
get
123-
{
124-
return (DataTemplate?)this.GetValue(ContentTemplateProperty);
125-
}
116+
get => (DataTemplate?)this.GetValue(ContentTemplateProperty);
126117

127-
set
128-
{
129-
this.SetValue(ContentTemplateProperty, value);
130-
}
118+
set => this.SetValue(ContentTemplateProperty, value);
131119
}
132120

133121
/// <summary>
134122
/// Gets or sets the <see cref="ContentTemplateSelector"/> which should be used for the content
135123
/// </summary>
136124
public DataTemplateSelector? ContentTemplateSelector
137125
{
138-
get
139-
{
140-
return (DataTemplateSelector?)this.GetValue(ContentTemplateSelectorProperty);
141-
}
126+
get => (DataTemplateSelector?)this.GetValue(ContentTemplateSelectorProperty);
142127

143-
set
144-
{
145-
this.SetValue(ContentTemplateSelectorProperty, value);
146-
}
128+
set => this.SetValue(ContentTemplateSelectorProperty, value);
147129
}
148130

149131
/// <summary>
150132
/// Get or sets the string format for the selected content.
151133
/// </summary>
152134
public string? SelectedContentStringFormat
153135
{
154-
get
155-
{
156-
return (string?)this.GetValue(SelectedContentStringFormatProperty);
157-
}
136+
get => (string?)this.GetValue(SelectedContentStringFormatProperty);
158137

159-
internal set
160-
{
161-
this.SetValue(SelectedContentStringFormatPropertyKey, value);
162-
}
138+
internal set => this.SetValue(SelectedContentStringFormatPropertyKey, value);
163139
}
164140

165141
/// <summary>
@@ -168,15 +144,9 @@ internal set
168144
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
169145
public DataTemplate? SelectedContentTemplate
170146
{
171-
get
172-
{
173-
return (DataTemplate?)this.GetValue(SelectedContentTemplateProperty);
174-
}
147+
get => (DataTemplate?)this.GetValue(SelectedContentTemplateProperty);
175148

176-
internal set
177-
{
178-
this.SetValue(SelectedContentTemplatePropertyKey, value);
179-
}
149+
internal set => this.SetValue(SelectedContentTemplatePropertyKey, value);
180150
}
181151

182152
/// <summary>
@@ -185,15 +155,9 @@ internal set
185155
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
186156
public DataTemplateSelector? SelectedContentTemplateSelector
187157
{
188-
get
189-
{
190-
return (DataTemplateSelector?)this.GetValue(SelectedContentTemplateSelectorProperty);
191-
}
158+
get => (DataTemplateSelector?)this.GetValue(SelectedContentTemplateSelectorProperty);
192159

193-
internal set
194-
{
195-
this.SetValue(SelectedContentTemplateSelectorPropertyKey, value);
196-
}
160+
internal set => this.SetValue(SelectedContentTemplateSelectorPropertyKey, value);
197161
}
198162

199163
#region ItemsPanelMinWidth
@@ -206,8 +170,8 @@ internal set
206170
/// </summary>
207171
public double ItemsPanelMinWidth
208172
{
209-
get { return (double)this.GetValue(ItemsPanelMinWidthProperty); }
210-
set { this.SetValue(ItemsPanelMinWidthProperty, value); }
173+
get => (double)this.GetValue(ItemsPanelMinWidthProperty);
174+
set => this.SetValue(ItemsPanelMinWidthProperty, value);
211175
}
212176

213177
#endregion
@@ -219,8 +183,8 @@ public double ItemsPanelMinWidth
219183
/// </summary>
220184
public Brush? ItemsPanelBackground
221185
{
222-
get { return (Brush?)this.GetValue(ItemsPanelBackgroundProperty); }
223-
set { this.SetValue(ItemsPanelBackgroundProperty, value); }
186+
get => (Brush?)this.GetValue(ItemsPanelBackgroundProperty);
187+
set => this.SetValue(ItemsPanelBackgroundProperty, value);
224188
}
225189

226190
/// <summary>Identifies the <see cref="ItemsPanelBackground"/> dependency property.</summary>
@@ -235,8 +199,8 @@ public Brush? ItemsPanelBackground
235199
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
236200
public Backstage? ParentBackstage
237201
{
238-
get { return (Backstage?)this.GetValue(ParentBackstageProperty); }
239-
set { this.SetValue(ParentBackstageProperty, value); }
202+
get => (Backstage?)this.GetValue(ParentBackstageProperty);
203+
set => this.SetValue(ParentBackstageProperty, value);
240204
}
241205

242206
/// <summary>Identifies the <see cref="ParentBackstage"/> dependency property.</summary>
@@ -248,8 +212,8 @@ public Backstage? ParentBackstage
248212
/// </summary>
249213
public bool IsWindowSteeringHelperEnabled
250214
{
251-
get { return (bool)this.GetValue(IsWindowSteeringHelperEnabledProperty); }
252-
set { this.SetValue(IsWindowSteeringHelperEnabledProperty, BooleanBoxes.Box(value)); }
215+
get => (bool)this.GetValue(IsWindowSteeringHelperEnabledProperty);
216+
set => this.SetValue(IsWindowSteeringHelperEnabledProperty, BooleanBoxes.Box(value));
253217
}
254218

255219
/// <summary>Identifies the <see cref="IsWindowSteeringHelperEnabled"/> dependency property.</summary>
@@ -261,8 +225,8 @@ public bool IsWindowSteeringHelperEnabled
261225
/// </summary>
262226
public bool IsBackButtonVisible
263227
{
264-
get { return (bool)this.GetValue(IsBackButtonVisibleProperty); }
265-
set { this.SetValue(IsBackButtonVisibleProperty, BooleanBoxes.Box(value)); }
228+
get => (bool)this.GetValue(IsBackButtonVisibleProperty);
229+
set => this.SetValue(IsBackButtonVisibleProperty, BooleanBoxes.Box(value));
266230
}
267231

268232
/// <summary>Identifies the <see cref="IsBackButtonVisible"/> dependency property.</summary>

0 commit comments

Comments
 (0)