Merge branch 'master' into develop

Author: batzen

Changelog.md

@@ -69,6 +69,13 @@
   - Selecting an `RibbonTabItem` brings it into view now
   - Improved keyboard navigation inside `BackstageTabControl`
   - Improved mouse wheel selection on `RibbonTabControl`
+  - `DropDownButton`
+    - Added support for `UsesItemContainerTemplate` and `ItemContainerTemplateSelector`
+  - `MenuItem`
+    - Added support for `UsesItemContainerTemplate` and `ItemContainerTemplateSelector`
+    - `IsSplit` is now automatically set by a style trigger. If `Command` is not null and `HasItems` is true.
+  - `RibbonMenu`
+    - Added support for `UsesItemContainerTemplate` and `ItemContainerTemplateSelector`
 
 - ### Bug fixes
 

Directory.packages.props

@@ -1,6 +1,6 @@
 <Project>
     <ItemGroup>
-        <PackageVersion Include="ControlzEx" version="7.0.0-alpha0106" />
+        <PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
         <PackageVersion Include="System.Memory" Version="4.5.5" />
     </ItemGroup>
 
@@ -15,7 +15,7 @@
 
         <PackageVersion Include="NUnit" version="4.1.0" />
 
-        <PackageVersion Include="System.Text.Json" version="8.0.4" />
+        <PackageVersion Include="System.Text.Json" version="8.0.5" />
 
         <!--<PackageVersion Include="Google.Cloud.Translate.V3" Version="2.4.0" />-->
     </ItemGroup>

Fluent.Ribbon.Showcase/TestContent.xaml

@@ -558,7 +558,6 @@
                         <Separator />
                         <Fluent:MenuItem Header="Set Default Paste..."
                                          Command="Paste"
-                                         IsSplit="True"
                                          KeyTip="A">
                             <Fluent:MenuItem Header="1"
                                              Click="OnMenuItemClick" />

Fluent.Ribbon/Controls/DropDownButton.cs

@@ -482,6 +482,64 @@ public override void OnApplyTemplate()
 
     #region Overrides
 
+    /// <summary>Gets or sets the custom logic for choosing a template used to display each item.</summary>
+    /// <returns>A custom object that provides logic and returns an item container.</returns>
+    public ItemContainerTemplateSelector? ItemContainerTemplateSelector
+    {
+        get => (ItemContainerTemplateSelector?)this.GetValue(StatusBar.ItemContainerTemplateSelectorProperty);
+        set => this.SetValue(StatusBar.ItemContainerTemplateSelectorProperty, value);
+    }
+
+    /// <summary>Gets or sets a value that indicates whether the menu selects different item containers, depending on the type of the item in the underlying collection or some other heuristic.</summary>
+    /// <returns>
+    ///        <see langword="true" /> the menu selects different item containers; otherwise, <see langword="false" />.
+    /// 
+    /// The registered default is <see langword="false" />. For more information about what can influence the value, see Dependency Property Value Precedence.</returns>
+    public bool UsesItemContainerTemplate
+    {
+        get => (bool)this.GetValue(StatusBar.UsesItemContainerTemplateProperty);
+        set => this.SetValue(StatusBar.UsesItemContainerTemplateProperty, value);
+    }
+
+    private object? currentItem;
+
+    /// <inheritdoc />
+    protected override bool IsItemItsOwnContainerOverride(object item)
+    {
+        if (base.IsItemItsOwnContainerOverride(item))
+        {
+            return true;
+        }
+
+        if (this.UsesItemContainerTemplate)
+        {
+            this.currentItem = item;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+        if (this.UsesItemContainerTemplate is false)
+        {
+            this.currentItem = null;
+            return base.GetContainerForItemOverride();
+        }
+
+        var item = this.currentItem;
+        this.currentItem = null;
+
+        var dataTemplate = this.ItemContainerTemplateSelector?.SelectTemplate(item, this);
+        if (dataTemplate is not null)
+        {
+            return dataTemplate.LoadContent();
+        }
+
+        return base.GetContainerForItemOverride();
+    }
+
     private void OnDropDownPopupKeyDown(object sender, KeyEventArgs e)
     {
         if (e.Handled)

Fluent.Ribbon/Controls/MenuItem.cs

@@ -410,16 +410,43 @@ public void OnKeyTipBack()
 
     #region Overrides
 
+    private object? currentItem;
+
     /// <inheritdoc />
-    protected override DependencyObject GetContainerForItemOverride()
+    protected override bool IsItemItsOwnContainerOverride(object item)
     {
-        return new MenuItem();
+        if (item is MenuItem or Separator)
+        {
+            return true;
+        }
+
+        if (this.UsesItemContainerTemplate)
+        {
+            this.currentItem = item;
+        }
+
+        return false;
     }
 
     /// <inheritdoc />
-    protected override bool IsItemItsOwnContainerOverride(object item)
+    protected override DependencyObject GetContainerForItemOverride()
     {
-        return item is FrameworkElement;
+        if (this.UsesItemContainerTemplate is false)
+        {
+            this.currentItem = null;
+            return new MenuItem();
+        }
+
+        var item = this.currentItem;
+        this.currentItem = null;
+
+        var dataTemplate = this.ItemContainerTemplateSelector.SelectTemplate(item, this);
+        if (dataTemplate is not null)
+        {
+            return dataTemplate.LoadContent();
+        }
+
+        return new MenuItem();
     }
 
     #region Non MenuBase ItemsControl workarounds

Fluent.Ribbon/Controls/RibbonMenu.cs

@@ -26,13 +26,12 @@ static RibbonMenu()
     /// <inheritdoc />
     protected override DependencyObject GetContainerForItemOverride()
     {
-        return new MenuItem();
-    }
+        if (this.UsesItemContainerTemplate)
+        {
+            return base.GetContainerForItemOverride();
+        }
 
-    /// <inheritdoc />
-    protected override bool IsItemItsOwnContainerOverride(object item)
-    {
-        return item is System.Windows.Controls.MenuItem or Separator;
+        return new MenuItem();
     }
 
     #endregion

Fluent.Ribbon/Themes/Controls/Button.xaml

@@ -15,10 +15,12 @@
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               RecognizesAccessKey="True"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                              Opacity=".75" />
+                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Grid>
         <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource AncestorType=Window}}" Value="False">
+                <Setter TargetName="contentPresenter" Property="Opacity" Value="0.75" />
+            </DataTrigger>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter TargetName="contentPresenter" Property="Opacity" Value="1" />
             </Trigger>

Fluent.Ribbon/Themes/Controls/InRibbonGallery.xaml

@@ -449,7 +449,7 @@
                     BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Control.Border}"
                     BorderThickness="1 1 1 1"
                     ClipToBounds="True">
-                <Grid Background="{DynamicResource Fluent.Ribbon.Brushes.White}">
+                <Grid Background="{DynamicResource Fluent.Ribbon.Brushes.InRibbonGallery.Content.Background}">
                     <ScrollViewer x:Name="ScrollViewer"
                                   Style="{DynamicResource Fluent.Ribbon.Styles.ScrollViewer}"
                                   Fluent:ScrollViewerAttachedProperties.ScrollBarStyle="{DynamicResource Fluent.Ribbon.Styles.InRibbonGallery.ScrollBar}"

Fluent.Ribbon/Themes/Controls/MenuItem.xaml

@@ -452,6 +452,13 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.MenuItem}" />
         <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Command, RelativeSource={RelativeSource Self}, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                    <Condition Binding="{Binding HasItems, RelativeSource={RelativeSource Self}}" Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Fluent:MenuItem.IsSplit" Value="True" />
+            </MultiDataTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="Fluent:MenuItem.IsSplit" Value="True" />

Fluent.Ribbon/Themes/Controls/RibbonScrollViewer.xaml

@@ -286,14 +286,11 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.ScrollViewer"
            TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+
         <Setter Property="Fluent:ScrollViewerAttachedProperties.ScrollBarStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ScrollBarWhite}" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.ScrollViewer}" />
-
-        <Style.Triggers>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-        </Style.Triggers>
     </Style>
 
     <Style x:Key="Fluent.Ribbon.Styles.RibbonGroupsContainerScrollViewer"