From 5da8036b9ad65cd8af0f23133867d5f836fc5cc6 Mon Sep 17 00:00:00 2001
From: mika kuns <mika.kuns@fb-tuning.de>
Date: Wed, 30 Sep 2026 08:48:36 +0200
Subject: [PATCH] style(ui): only top-level lists align to the folder chevron

---
 .../Views/Islands/ListsIslandView.axaml       | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml b/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
index 0190b804..be95c9b4 100644
--- a/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
+++ b/src/ClaudeDo.Ui/Views/Islands/ListsIslandView.axaml
@@ -8,6 +8,16 @@
   <!-- Implicit, type-matched templates: the sidebar's top level is one mixed ItemsControl over
        TopLevel (folders and folder-less lists interleaved), and each folder's children resolve the
        list template the same way. -->
+  <!-- Glyph alignment is a style, not a local value, so the nested class can override it. -->
+  <UserControl.Styles>
+    <Style Selector="Panel.list-glyph > :is(Control)">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+    <Style Selector="Panel.list-glyph.nested > :is(Control)">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+    </Style>
+  </UserControl.Styles>
+
   <UserControl.DataTemplates>
     <!-- One user-list row. Shared by the top level and by each folder's children, so the
          row (context menu, drag handlers, drop indicators) exists once. -->
@@ -57,11 +67,11 @@
                         CommandParameter="{Binding}"/>
             </ContextMenu>
           </Border.ContextMenu>
-          <!-- Icon left-aligned in a chevron-width slot, so a list starts where a sibling folder's
-               chevron does. -->
-          <Grid ColumnDefinitions="14,*,Auto">
+          <!-- Inside a folder: a spacer for the chevron slot, so list and subfolder icons line up.
+               At the top level: no spacer, glyph left-aligned to where a folder's chevron starts. -->
+          <Grid ColumnDefinitions="Auto,20,*,Auto">
             <!-- Left accent bar for active state -->
-            <Border Grid.Column="0" Grid.ColumnSpan="3"
+            <Border Grid.Column="0" Grid.ColumnSpan="4"
                     Background="Transparent"
                     CornerRadius="8" IsHitTestVisible="False"
                     IsVisible="{Binding IsActive}">
@@ -72,20 +82,25 @@
                       Margin="-2,0,0,0"/>
             </Border>
             <!-- Icon (list-settings → Icon tab; "Folder" when unset) -->
-            <PathIcon Grid.Column="0" Classes="list-icon"
-                      Width="14" Height="14" IsVisible="{Binding !IsDot}"
-                      Data="{Binding IconKey, Converter={StaticResource IconKey}}"
-                      HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <Ellipse Grid.Column="0" Width="8" Height="8" IsVisible="{Binding IsDot}"
-                     Fill="{Binding DotColorKey, Converter={StaticResource DotBrush}}"
-                     HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <Border Grid.Column="0" Width="12"
+                    IsVisible="{Binding FolderId, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+            <Panel Grid.Column="1" Classes="list-glyph"
+                   Classes.nested="{Binding FolderId, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+              <PathIcon Classes="list-icon"
+                        Width="14" Height="14" IsVisible="{Binding !IsDot}"
+                        Data="{Binding IconKey, Converter={StaticResource IconKey}}"
+                        VerticalAlignment="Center"/>
+              <Ellipse Width="8" Height="8" IsVisible="{Binding IsDot}"
+                       Fill="{Binding DotColorKey, Converter={StaticResource DotBrush}}"
+                       VerticalAlignment="Center"/>
+            </Panel>
             <!-- Name -->
-            <TextBlock Grid.Column="1" Classes="list-label"
+            <TextBlock Grid.Column="2" Classes="list-label"
                        Text="{Binding Name}" ToolTip.Tip="{Binding Name}"
                        VerticalAlignment="Center" Margin="8,0"
                        Foreground="{DynamicResource TextDimBrush}" FontSize="{StaticResource FontSizeBody}"/>
             <!-- Count -->
-            <TextBlock Grid.Column="2" Classes="list-count"
+            <TextBlock Grid.Column="3" Classes="list-count"
                        Text="{Binding Count}" IsVisible="{Binding HasCount}"/>
           </Grid>
         </Border>