From cc1cb061fbc05c56b6254ef5fdc9698449449897 Mon Sep 17 00:00:00 2001
From: heartacker <heartacker@outlook.com>
Date: Fri, 18 Jul 2025 15:49:31 +0800
Subject: [PATCH 1/2] add SimplifyByDecoration mode Fixes #1595

---
 src/Models/RepositorySettings.cs  |  6 ++++++
 src/Resources/Locales/en_US.axaml |  1 +
 src/ViewModels/Repository.cs      | 17 +++++++++++++++++
 src/Views/Repository.axaml        | 18 ++++++++++++++++--
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 4e51b368a..8fce509fe 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -14,6 +14,12 @@ public string DefaultRemote
             set;
         } = string.Empty;
 
+        public bool SimplifyByDecoration
+        {
+            get;
+            set;
+        } = false;
+
         public bool EnableReflog
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 03282867d..40c45d9d3 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -670,6 +670,7 @@
   <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Current Branch</x:String>
   <x:String x:Key="Text.Repository.ShowFirstParentOnly" xml:space="preserve">Show first-parent only</x:String>
   <x:String x:Key="Text.Repository.ShowLostCommits" xml:space="preserve">Show lost commits</x:String>
+  <x:String x:Key="Text.Repository.SimplifyByDecoration" xml:space="preserve">Show Decorate Commits Only</x:String>
   <x:String x:Key="Text.Repository.ShowSubmodulesAsTree" xml:space="preserve">Show Submodules as Tree</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Show Tags as Tree</x:String>
   <x:String x:Key="Text.Repository.Skip" xml:space="preserve">SKIP</x:String>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 931a10876..d8ba871b8 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -91,6 +91,20 @@ public object SelectedView
             set => SetProperty(ref _selectedView, value);
         }
 
+        public bool SimplifyByDecoration
+        {
+            get => _settings.SimplifyByDecoration;
+            set
+            {
+                if (value != _settings.SimplifyByDecoration)
+                {
+                    _settings.SimplifyByDecoration = value;
+                    OnPropertyChanged();
+                    Task.Run(RefreshCommits);
+                }
+            }
+        }
+
         public bool EnableReflog
         {
             get => _settings.EnableReflog;
@@ -1271,6 +1285,9 @@ public void RefreshCommits()
                 builder.Append("--reflog ");
             if (_settings.EnableFirstParentInHistories)
                 builder.Append("--first-parent ");
+            // only show commits with decorators
+            if (_settings.SimplifyByDecoration)
+                builder.Append("--simplify-by-decoration ");
 
             var filters = _settings.BuildHistoriesFilter();
             if (string.IsNullOrEmpty(filters))
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 910ec07fb..b642f2630 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -83,7 +83,7 @@
               </ListBox.ItemsPanel>
 
               <ListBoxItem>
-                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto">
+                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>
 
@@ -131,7 +131,21 @@
                                 ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInGraph}">
                     <Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
                   </ToggleButton>
-                  <Button Grid.Column="6"
+                  <ToggleButton Grid.Column="6"
+                                Classes="line_path"
+                                Width="26" Height="26"
+                                Background="Transparent"
+                                IsChecked="{Binding SimplifyByDecoration, Mode=TwoWay}">
+                      <ToolTip.Tip>
+                        <TextBlock>
+                          <Run Text="{DynamicResource Text.Repository.SimplifyByDecoration}"/>
+                          <Run Text=" "/>
+                          <Run Text="--simplify-by-decoration" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+                        </TextBlock>
+                      </ToolTip.Tip>
+                      <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
+                    </ToggleButton>
+                  <Button Grid.Column="7"
                           Classes="icon_button"
                           Width="26" Height="26"
                           Click="OnOpenAdvancedHistoriesOption">

From 5e4d7480aa6d857c35dc37055052092bd61d60fa Mon Sep 17 00:00:00 2001
From: heartacker <heartacker@outlook.com>
Date: Fri, 18 Jul 2025 16:01:08 +0800
Subject: [PATCH 2/2] use stackpanel instead of grid for those icons

---
 src/Views/Repository.axaml | 100 ++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index b642f2630..24cedf721 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -83,59 +83,14 @@
               </ListBox.ItemsPanel>
 
               <ListBoxItem>
-                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
+                <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>
-
-                  <ToggleButton Grid.Column="2"
-                                Classes="line_path"
-                                Width="26" Height="26"
-                                Background="Transparent"
-                                IsChecked="{Binding EnableReflog, Mode=TwoWay}">
-                    <ToolTip.Tip>
-                      <TextBlock>
-                        <Run Text="{DynamicResource Text.Repository.ShowLostCommits}"/>
-                        <Run Text=" "/>
-                        <Run Text="--reflog" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
-                      </TextBlock>
-                    </ToolTip.Tip>
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.Reference}"/>
-                  </ToggleButton>
-                  <ToggleButton Grid.Column="3"
-                                Classes="line_path"
-                                Width="26" Height="26"
-                                Background="Transparent"
-                                IsChecked="{Binding EnableFirstParentInHistories, Mode=TwoWay}">
-                    <ToolTip.Tip>
-                      <TextBlock>
-                        <Run Text="{DynamicResource Text.Repository.ShowFirstParentOnly}"/>
-                        <Run Text=" "/>
-                        <Run Text="--first-parent" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
-                      </TextBlock>
-                    </ToolTip.Tip>
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.FirstParentFilter}"/>
-                  </ToggleButton>
-                  <ToggleButton Grid.Column="4"
-                                Classes="line_path"
-                                Width="26" Height="26"
-                                Background="Transparent"
-                                IsChecked="{Binding OnlyHighlightCurrentBranchInHistories, Mode=TwoWay}"
-                                ToolTip.Tip="{DynamicResource Text.Repository.OnlyHighlightCurrentBranchInGraph}">
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.LightOn}"/>
-                  </ToggleButton>
-                  <ToggleButton Grid.Column="5"
-                                Classes="line_path"
-                                Width="26" Height="26"
-                                Background="Transparent"
-                                IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
-                                ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInGraph}">
-                    <Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
-                  </ToggleButton>
-                  <ToggleButton Grid.Column="6"
-                                Classes="line_path"
-                                Width="26" Height="26"
-                                Background="Transparent"
-                                IsChecked="{Binding SimplifyByDecoration, Mode=TwoWay}">
+                  <StackPanel Grid.Column="2" Orientation="Horizontal">
+                    <ToggleButton Classes="line_path"
+                                  Width="26" Height="26"
+                                  Background="Transparent"
+                                  IsChecked="{Binding SimplifyByDecoration, Mode=TwoWay}">
                       <ToolTip.Tip>
                         <TextBlock>
                           <Run Text="{DynamicResource Text.Repository.SimplifyByDecoration}"/>
@@ -145,7 +100,48 @@
                       </ToolTip.Tip>
                       <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
                     </ToggleButton>
-                  <Button Grid.Column="7"
+                    <ToggleButton Classes="line_path"
+                                  Width="26" Height="26"
+                                  Background="Transparent"
+                                  IsChecked="{Binding EnableReflog, Mode=TwoWay}">
+                      <ToolTip.Tip>
+                        <TextBlock>
+                          <Run Text="{DynamicResource Text.Repository.ShowLostCommits}"/>
+                          <Run Text=" "/>
+                          <Run Text="--reflog" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+                        </TextBlock>
+                      </ToolTip.Tip>
+                      <Path Width="12" Height="12" Data="{StaticResource Icons.Reference}"/>
+                    </ToggleButton>
+                    <ToggleButton Classes="line_path"
+                                  Width="26" Height="26"
+                                  Background="Transparent"
+                                  IsChecked="{Binding EnableFirstParentInHistories, Mode=TwoWay}">
+                      <ToolTip.Tip>
+                        <TextBlock>
+                          <Run Text="{DynamicResource Text.Repository.ShowFirstParentOnly}"/>
+                          <Run Text=" "/>
+                          <Run Text="--first-parent" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+                        </TextBlock>
+                      </ToolTip.Tip>
+                      <Path Width="12" Height="12" Data="{StaticResource Icons.FirstParentFilter}"/>
+                    </ToggleButton>
+                    <ToggleButton Classes="line_path"
+                                  Width="26" Height="26"
+                                  Background="Transparent"
+                                  IsChecked="{Binding OnlyHighlightCurrentBranchInHistories, Mode=TwoWay}"
+                                  ToolTip.Tip="{DynamicResource Text.Repository.OnlyHighlightCurrentBranchInGraph}">
+                      <Path Width="12" Height="12" Data="{StaticResource Icons.LightOn}"/>
+                    </ToggleButton>
+                    <ToggleButton Classes="line_path"
+                                  Width="26" Height="26"
+                                  Background="Transparent"
+                                  IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
+                                  ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInGraph}">
+                      <Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
+                    </ToggleButton>
+                  </StackPanel>
+                  <Button Grid.Column="3"
                           Classes="icon_button"
                           Width="26" Height="26"
                           Click="OnOpenAdvancedHistoriesOption">