Merge pull request #1049 from zui-jiu-zhou/develop

IsDisplayOptionsButtonVisible property is added to RibbonTabControl
fluentribbon · Aug 9, 2022 · 336efde · 336efde
2 parents 6a7ca90 + 1fab06d
commit 336efde
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Fluent.Ribbon/Controls/RibbonTabControl.cs b/Fluent.Ribbon/Controls/RibbonTabControl.cs
@@ -393,6 +393,18 @@ public bool IsMouseWheelScrollingEnabled
         get { return (bool)this.GetValue(IsMouseWheelScrollingEnabledProperty); }
         set { this.SetValue(IsMouseWheelScrollingEnabledProperty, BooleanBoxes.Box(value)); }
     }
+
+    /// <summary>Identifies the <see cref="IsDisplayOptionsButtonVisible"/> dependency property.</summary>
+    public static readonly DependencyProperty IsDisplayOptionsButtonVisibleProperty = DependencyProperty.Register(nameof(IsDisplayOptionsButtonVisible), typeof(bool), typeof(RibbonTabControl), new PropertyMetadata(BooleanBoxes.TrueBox));
+
+    /// <summary>
+    /// Defines whether display options button is visible or not.
+    /// </summary>
+    public bool IsDisplayOptionsButtonVisible
+    {
+        get { return (bool)this.GetValue(IsDisplayOptionsButtonVisibleProperty); }
+        set { this.SetValue(IsDisplayOptionsButtonVisibleProperty, BooleanBoxes.Box(value)); }
+    }
 
     #endregion
 
@@ -1052,4 +1064,4 @@ protected override IEnumerator LogicalChildren
             }
         }
     }
-}
+}
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
@@ -327,7 +327,8 @@
                                            Icon="{DynamicResource Fluent.Ribbon.Images.RibbonDisplayOptions}"
                                            Size="Small"
                                            Style="{DynamicResource Fluent.Ribbon.Styles.RibbonTabControl.DisplayOptionsButton}"
-                                           ToolTip="{DynamicResource Fluent.Ribbon.ScreenTips.Resources.RibbonTabControl.DisplayOptionsScreenTip}">
+                                           ToolTip="{DynamicResource Fluent.Ribbon.ScreenTips.Resources.RibbonTabControl.DisplayOptionsScreenTip}"
+                                           Visibility="{Binding IsDisplayOptionsButtonVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}">
                         <Fluent:MenuItem Header="{Binding Source={x:Static Fluent:RibbonLocalization.Current}, Path=Localization.ShowRibbon, Mode=OneWay}"
                                          FontWeight="Bold"
                                          Foreground="{DynamicResource Fluent.Ribbon.Brushes.Black}"
@@ -421,4 +422,4 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-</ResourceDictionary>
+</ResourceDictionary>