From f7ca5be7917eed658ba2362ab1ed5af54c60f38b Mon Sep 17 00:00:00 2001
From: Splitwirez <Splitwirez@gmail.com>
Date: Sun, 3 Mar 2019 16:57:05 -0500
Subject: [PATCH 1/3] preparing to add simplified ribbon

---
 Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
index e63630797..d347cb08b 100644
--- a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
+++ b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <RootNamespace>FluentTest</RootNamespace>

From 1cb5a75e474659e5070f7f0b1c4f446a83a0a938 Mon Sep 17 00:00:00 2001
From: Splitwirez <Splitwirez@gmail.com>
Date: Wed, 6 Mar 2019 11:22:53 -0500
Subject: [PATCH 2/3] And so it begins

---
 .../Fluent.Ribbon.Showcase.csproj             |  8 ++
 .../SimplifiedRibbonWindow.xaml               | 53 ++++++++++++
 .../SimplifiedRibbonWindow.xaml.cs            | 10 +++
 Fluent.Ribbon.Showcase/TestContent.xaml       |  3 +
 Fluent.Ribbon.Showcase/TestContent.xaml.cs    |  5 ++
 Fluent.Ribbon/Controls/Ribbon.cs              | 14 ++++
 Fluent.Ribbon/Themes/Controls/Button.xaml     | 80 +++++++++++++++++++
 Fluent.Ribbon/Themes/Controls/Ribbon.xaml     |  3 +
 .../Themes/Controls/RibbonGroupBox.xaml       | 27 ++++++-
 9 files changed, 200 insertions(+), 3 deletions(-)
 create mode 100644 Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
 create mode 100644 Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml.cs

diff --git a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
index d347cb08b..fe6aa74e8 100644
--- a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
+++ b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
@@ -14,6 +14,9 @@
     <ApplicationIcon>Icons\App.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="SimplifiedRibbonWindow.xaml" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest" />
   </ItemGroup>
@@ -29,4 +32,9 @@
     <Reference Include="System.Data" />
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="SimplifiedRibbonWindow.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
new file mode 100644
index 000000000..4181b8a19
--- /dev/null
+++ b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
@@ -0,0 +1,53 @@
+<fluent:RibbonWindow x:Class="FluentTest.SimplifiedRibbonWindow"
+                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     xmlns:fluent="urn:fluent-ribbon"
+                     xmlns:converters="clr-namespace:FluentTest.Converters"
+                     mc:Ignorable="d"
+                     Title="SimplifiedRibbonWindow"
+                     Height="600"
+                     Width="800"
+                     TitleForeground="Black"
+                     TitleBackground="Transparent">
+    <Grid>
+        <fluent:Ribbon IsSimplified="True">
+            <fluent:Ribbon.Menu>
+                <fluent:Backstage />
+            </fluent:Ribbon.Menu>
+
+            <fluent:RibbonTabItem Header="First">
+                <fluent:RibbonGroupBox>
+                    <fluent:Button Header="First Button">
+                        <fluent:Button.Icon>
+                            <Rectangle Width="24" Height="24" Fill="Red"/>
+                        </fluent:Button.Icon>
+                    </fluent:Button>
+                    <fluent:Button Header="Second Button">
+                        <fluent:Button.Icon>
+                            <Rectangle Width="24" Height="24" Fill="Green"/>
+                        </fluent:Button.Icon>
+                    </fluent:Button>
+                </fluent:RibbonGroupBox>
+                <fluent:RibbonGroupBox>
+                    <fluent:Button Header="Third Button">
+                        <fluent:Button.Icon>
+                            <Rectangle Width="24" Height="24" Fill="Blue"/>
+                        </fluent:Button.Icon>
+                    </fluent:Button>
+                    <fluent:Button Header="Fourth Button">
+                        <fluent:Button.Icon>
+                            <Rectangle Width="24" Height="24" Fill="Yellow"/>
+                        </fluent:Button.Icon>
+                    </fluent:Button>
+                </fluent:RibbonGroupBox>
+            </fluent:RibbonTabItem>
+            <fluent:RibbonTabItem Header="Second">
+                <fluent:RibbonGroupBox>
+                    <fluent:Button/>
+                </fluent:RibbonGroupBox>
+            </fluent:RibbonTabItem>
+        </fluent:Ribbon>
+    </Grid>
+</fluent:RibbonWindow>
diff --git a/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml.cs b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml.cs
new file mode 100644
index 000000000..6da3e8e29
--- /dev/null
+++ b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml.cs
@@ -0,0 +1,10 @@
+namespace FluentTest
+{
+    public partial class SimplifiedRibbonWindow
+    {
+        public SimplifiedRibbonWindow()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
index a43f032cf..59629e8c0 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -3255,6 +3255,9 @@ Pellentesque nec dolor sed lacus tristique rutrum sed vitae urna. Sed eu pharetr
                             <Fluent:Button x:Name="OpenRibbonWindowWithBackgroundImage"
                                            Size="Middle"
                                            Click="OpenRibbonWindowWithBackgroundImage_OnClick">Open Ribbon-Window (with background image)</Fluent:Button>
+                            <Fluent:Button x:Name="OpenSimplifiedRibbonWindow"
+                                           Size="Middle"
+                                           Click="OpenSimplifiedRibbonWindow_OnClick">Open Simplified Ribbon-Window</Fluent:Button>
                         </WrapPanel>
                     </GroupBox>
                     <GroupBox Header="Issue repros">
diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml.cs b/Fluent.Ribbon.Showcase/TestContent.xaml.cs
index 2561e3a26..232cf207f 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml.cs
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml.cs
@@ -505,6 +505,11 @@ private async void HandleShowMetroMessage(object sender, RoutedEventArgs e)
 
             await metroWindow.ShowMessageAsync("Test", "Message");
         }
+
+        private void OpenSimplifiedRibbonWindow_OnClick(object sender, RoutedEventArgs e)
+        {
+            new SimplifiedRibbonWindow().Show();
+        }
     }
 
     public class TestRoutedCommand
diff --git a/Fluent.Ribbon/Controls/Ribbon.cs b/Fluent.Ribbon/Controls/Ribbon.cs
index 9cae60aae..2a1fa2cec 100644
--- a/Fluent.Ribbon/Controls/Ribbon.cs
+++ b/Fluent.Ribbon/Controls/Ribbon.cs
@@ -612,6 +612,20 @@ public RibbonTabControl TabControl
 
         #endregion
 
+        /// <summary>
+        /// Gets or sets whether or not the ribbon is in Simplified mode
+        /// </summary>
+        public bool IsSimplified
+        {
+            get { return (bool)this.GetValue(IsSimplifiedProperty); }
+            set { this.SetValue(IsSimplifiedProperty, value); }
+        }
+
+        /// <summary>
+        /// <see cref="DependencyProperty"/> for <see cref="IsSimplified"/>.
+        /// </summary>
+        public static readonly DependencyProperty IsSimplifiedProperty = DependencyProperty.Register(nameof(IsSimplified), typeof(bool), typeof(Ribbon), new PropertyMetadata(BooleanBoxes.FalseBox));
+
         /// <summary>
         /// Gets or sets selected tab item
         /// </summary>
diff --git a/Fluent.Ribbon/Themes/Controls/Button.xaml b/Fluent.Ribbon/Themes/Controls/Button.xaml
index 468811de8..31716cbd1 100644
--- a/Fluent.Ribbon/Themes/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Button.xaml
@@ -204,6 +204,79 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="SimplifiedRibbonButtonControlTemplate"
+                     TargetType="{x:Type Fluent:Button}">
+        <Border x:Name="border"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                Height="Auto">
+            <StackPanel x:Name="stackPanel"
+                        Height="Auto"
+                        Margin="1 0"
+                        Orientation="Horizontal">
+                <ContentPresenter x:Name="iconImage"
+                                  HorizontalAlignment="Center"
+                                  Height="24"
+                                  VerticalAlignment="Center"
+                                  Content="{converters:ObjectToImageConverter {Binding Icon, RelativeSource={RelativeSource TemplatedParent}}, '16,16', {Binding RelativeSource={RelativeSource TemplatedParent}}}"
+                                  Width="24"
+                                  Margin="0"
+                                  SnapsToDevicePixels="True" />
+                <Fluent:TwoLineLabel x:Name="controlLabel"
+                                     Text="{TemplateBinding Header}"
+                                     HorizontalAlignment="Stretch"
+                                     VerticalAlignment="Center"
+                                     Margin="7 0"
+                                     HasTwoLines="False"/>
+            </StackPanel>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsPressed"
+                     Value="True">
+                <Setter Property="BorderBrush"
+                        TargetName="border"
+                        Value="{DynamicResource Fluent.Ribbon.Brushes.Button.Pressed.BorderBrush}" />
+                <Setter Property="Background"
+                        TargetName="border"
+                        Value="{DynamicResource Fluent.Ribbon.Brushes.Button.Pressed.Background}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+                <Setter Property="Opacity"
+                        TargetName="iconImage"
+                        Value="0.5" />
+                <Setter Property="Opacity"
+                        TargetName="controlLabel"
+                        Value="0.5" />
+                <Setter Property="Effect"
+                        TargetName="iconImage">
+                    <Setter.Value>
+                        <Fluent:GrayscaleEffect />
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver"
+                               Value="True" />
+                    <Condition Property="IsPressed"
+                               Value="False" />
+                    <Condition Property="IsEnabled"
+                               Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter Property="Background"
+                        TargetName="border"
+                        Value="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}" />
+                <Setter Property="BorderBrush"
+                        TargetName="border"
+                        Value="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}" />
+            </MultiTrigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"
@@ -244,6 +317,13 @@
                 <Setter Property="HorizontalAlignment"
                         Value="Left" />
             </Trigger>
+            <DataTrigger Binding="{Binding IsSimplified, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Fluent:Ribbon}}, FallbackValue=False}"
+                         Value="True">
+                <Setter Property="Template"
+                        Value="{DynamicResource SimplifiedRibbonButtonControlTemplate}"/>
+                <Setter Property="Height"
+                        Value="28"/>
+            </DataTrigger>
         </Style.Triggers>
     </Style>
 
diff --git a/Fluent.Ribbon/Themes/Controls/Ribbon.xaml b/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
index 0e3079bbb..ab0fc813c 100644
--- a/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
@@ -79,6 +79,9 @@
                         TargetName="quickAccessToolBarHolder"
                         Value="Collapsed" />
             </Trigger>
+            <Trigger Property="IsSimplified" Value="True">
+                <Setter TargetName="PART_RibbonTabControl" Property="ContentHeight" Value="42"/>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml b/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml
index 250c15f6a..f80c11b6d 100644
--- a/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml
+++ b/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml
@@ -13,12 +13,17 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Separator">
-                    <Border Width="1"
-                            Height="55"
+                    <Border x:Name="SeparatorBorder"
+                            Width="1"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Margin="2,5,2,10"
                             Background="{TemplateBinding Background}" />
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding IsSimplified, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Fluent:Ribbon}}, FallbackValue=False}" Value="False">
+                            <Setter TargetName="SeparatorBorder" Property="Height" Value="55"/>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -264,6 +269,14 @@
                                                         Height="Auto"
                                                         IsItemsHost="True"
                                                         Margin="4,0,4,0" />
+                        <StackPanel x:Name="SimplifiedUpPanel"
+                                    Visibility="Collapsed"
+                                    Orientation="Horizontal"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                        VerticalAlignment="Stretch"
+                                                        Width="Auto"
+                                                        Height="Auto"
+                                                        Margin="4,0,4,0" />
 
                         <Grid x:Name="PART_DownGrid"
                               MaxWidth="{Binding ActualWidth, ElementName=PART_ParentPanel}"
@@ -315,7 +328,8 @@
                       Visibility="Collapsed"
                       Grid.RowSpan="2">
 
-                    <ContentControl Content="{TemplateBinding Header}"
+                    <ContentControl x:Name="HeaderContentControl"
+                                    Content="{TemplateBinding Header}"
                                     ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                     ContentTemplate="{TemplateBinding HeaderTemplate}"
                                     ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -377,6 +391,13 @@
                    Visibility="Collapsed" />
         </Grid>
         <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding IsSimplified, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Fluent:Ribbon}}, FallbackValue=False}" Value="True">
+                <Setter TargetName="PART_UpPanel" Property="IsItemsHost" Value="False"/>
+                <Setter TargetName="PART_UpPanel" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="SimplifiedUpPanel" Property="IsItemsHost" Value="True"/>
+                <Setter TargetName="SimplifiedUpPanel" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="PART_DownGrid" Property="Visibility" Value="Collapsed"/>
+            </DataTrigger>
             <Trigger Property="State"
                      Value="Collapsed">
                 <Setter Property="Visibility"

From c2e564f15ef6c175dd04d63268fce8cef534f90f Mon Sep 17 00:00:00 2001
From: Splitwirez <Splitwirez@gmail.com>
Date: Tue, 12 Mar 2019 13:57:51 -0400
Subject: [PATCH 3/3] Medium icons

---
 .../SimplifiedRibbonWindow.xaml                  | 16 ++++++++--------
 Fluent.Ribbon/Controls/Button.cs                 | 15 +++++++++++++++
 Fluent.Ribbon/Themes/Controls/Button.xaml        |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
index 4181b8a19..25f08d62c 100644
--- a/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
+++ b/Fluent.Ribbon.Showcase/SimplifiedRibbonWindow.xaml
@@ -20,26 +20,26 @@
             <fluent:RibbonTabItem Header="First">
                 <fluent:RibbonGroupBox>
                     <fluent:Button Header="First Button">
-                        <fluent:Button.Icon>
+                        <fluent:Button.MediumIcon>
                             <Rectangle Width="24" Height="24" Fill="Red"/>
-                        </fluent:Button.Icon>
+                        </fluent:Button.MediumIcon>
                     </fluent:Button>
                     <fluent:Button Header="Second Button">
-                        <fluent:Button.Icon>
+                        <fluent:Button.MediumIcon>
                             <Rectangle Width="24" Height="24" Fill="Green"/>
-                        </fluent:Button.Icon>
+                        </fluent:Button.MediumIcon>
                     </fluent:Button>
                 </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox>
                     <fluent:Button Header="Third Button">
-                        <fluent:Button.Icon>
+                        <fluent:Button.MediumIcon>
                             <Rectangle Width="24" Height="24" Fill="Blue"/>
-                        </fluent:Button.Icon>
+                        </fluent:Button.MediumIcon>
                     </fluent:Button>
                     <fluent:Button Header="Fourth Button">
-                        <fluent:Button.Icon>
+                        <fluent:Button.MediumIcon>
                             <Rectangle Width="24" Height="24" Fill="Yellow"/>
-                        </fluent:Button.Icon>
+                        </fluent:Button.MediumIcon>
                     </fluent:Button>
                 </fluent:RibbonGroupBox>
             </fluent:RibbonTabItem>
diff --git a/Fluent.Ribbon/Controls/Button.cs b/Fluent.Ribbon/Controls/Button.cs
index e6183f6fa..05e9e2dcc 100644
--- a/Fluent.Ribbon/Controls/Button.cs
+++ b/Fluent.Ribbon/Controls/Button.cs
@@ -112,6 +112,21 @@ public object LargeIcon
         /// </summary>
         public static readonly DependencyProperty LargeIconProperty = DependencyProperty.Register(nameof(LargeIcon), typeof(object), typeof(Button), new PropertyMetadata());
 
+        /// <summary>
+        /// a
+        /// </summary>
+        public object MediumIcon
+        {
+            get { return this.GetValue(MediumIconProperty); }
+            set { this.SetValue(MediumIconProperty, value); }
+        }
+
+        /// <summary>
+        /// Using a DependencyProperty as the backing store for SmallIcon.
+        /// This enables animation, styling, binding, etc...
+        /// </summary>
+        public static readonly DependencyProperty MediumIconProperty = DependencyProperty.Register(nameof(MediumIcon), typeof(object), typeof(Button), new PropertyMetadata());
+
         #endregion
 
         #region IsDefinitive
diff --git a/Fluent.Ribbon/Themes/Controls/Button.xaml b/Fluent.Ribbon/Themes/Controls/Button.xaml
index 31716cbd1..17a89c131 100644
--- a/Fluent.Ribbon/Themes/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Button.xaml
@@ -221,7 +221,7 @@
                                   HorizontalAlignment="Center"
                                   Height="24"
                                   VerticalAlignment="Center"
-                                  Content="{converters:ObjectToImageConverter {Binding Icon, RelativeSource={RelativeSource TemplatedParent}}, '16,16', {Binding RelativeSource={RelativeSource TemplatedParent}}}"
+                                  Content="{converters:ObjectToImageConverter {Binding MediumIcon, RelativeSource={RelativeSource TemplatedParent}}, '16,16', {Binding RelativeSource={RelativeSource TemplatedParent}}}"
                                   Width="24"
                                   Margin="0"
                                   SnapsToDevicePixels="True" />