From 065ca867294c59fc33d76ea51a92d7f38e10dca0 Mon Sep 17 00:00:00 2001
From: adnan-bhaldar <adnanbhaldar115@gmail.com>
Date: Sun, 25 Oct 2026 17:24:35 +0530
Subject: [PATCH 1/3] fix(ui): keep list and dropdown highlights clear of the
 scrollbar and inside rounded corners

---
 src/Filee.App/Styles/Soft.axaml | 37 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/Filee.App/Styles/Soft.axaml b/src/Filee.App/Styles/Soft.axaml
index d6b28b2c..7cd8410e 100644
--- a/src/Filee.App/Styles/Soft.axaml
+++ b/src/Filee.App/Styles/Soft.axaml
@@ -27,15 +27,6 @@
           <SolidColorBrush x:Key="AccentFaintBrush" Color="#177F77DD" />
           <SolidColorBrush x:Key="AccentStrongBrush" Color="#5F59A6" />
           <SolidColorBrush x:Key="OnAccentBrush" Color="#FFFFFF" />
-          <!-- Plain buttons: the surface with a thin border, so only a disabled control is a flat grey (#524).
-               ThemeService gives them a theme's own surface (Material You, theme.json). -->
-
-          <SolidColorBrush x:Key="ButtonBackground" Color="#FFFFFF" />
-          <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#EFEDE6" />
-          <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#E6E3DA" />
-          <SolidColorBrush x:Key="ButtonBorderBrush" Color="#29000000" />
-          <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#3D000000" />
-          <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#3D000000" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
           <SolidColorBrush x:Key="PageBrush" Color="#1B1B19" />
@@ -53,12 +44,6 @@
           <SolidColorBrush x:Key="AccentFaintBrush" Color="#177F77DD" />
           <SolidColorBrush x:Key="AccentStrongBrush" Color="#5F59A6" />
           <SolidColorBrush x:Key="OnAccentBrush" Color="#FFFFFF" />
-          <SolidColorBrush x:Key="ButtonBackground" Color="#262624" />
-          <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#31312E" />
-          <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#3A3A36" />
-          <SolidColorBrush x:Key="ButtonBorderBrush" Color="#38FFFFFF" />
-          <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#4DFFFFFF" />
-          <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#4DFFFFFF" />
         </ResourceDictionary>
       </ResourceDictionary.ThemeDictionaries>
 
@@ -236,12 +221,28 @@
   <Style Selector="ListBox.soft ListBoxItem">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
     <Setter Property="Padding" Value="10,7" />
-    <Setter Property="Margin" Value="0,1" />
+    <!-- 16px on the right is kept free for the scrollbar (it floats over the list and grows on hover), so the
+         selected / hovered row ends before it. -->
+    <Setter Property="Margin" Value="0,1,16,1" />
   </Style>
   <Style Selector="ListBox.soft ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />
   </Style>
 
+  <!-- ───────── Dropdown lists (ComboBox): rows are rounded and inset, so the selected / hovered row sits inside the
+       rounded popup instead of poking out of its corners. The popup takes the Softness radius (SoftRadius) and the
+       rows the smaller one (SoftRadiusSmall), so both follow the Theme page's Softness, down to sharp corners. ───────── -->
+  <!-- No padding on the right of the popup and 16px of margin on the right of each row instead: the scrollbar floats
+       over the list (thin, growing on hover), so the rows end before it rather than running underneath. -->
+  <Style Selector="ComboBox /template/ Border#PopupBorder">
+    <Setter Property="CornerRadius" Value="{DynamicResource SoftRadius}" />
+    <Setter Property="Padding" Value="6,6,0,6" />
+  </Style>
+  <Style Selector="ComboBoxItem">
+    <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
+    <Setter Property="Margin" Value="0,1,16,1" />
+  </Style>
+
   <!-- ───────── Page content fade-in (keyframes can't animate RenderTransform, so Margin slides) ───────── -->
   <Style Selector="ContentControl.page > :is(Control)">
     <Style.Animations>
@@ -459,13 +460,13 @@
     <Setter Property="Background" Value="{DynamicResource SurfaceBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SubtleBorderBrush}" />
     <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="6" />
+    <Setter Property="Padding" Value="6,6,0,6" />
     <Setter Property="BoxShadow" Value="{DynamicResource CardShadow}" />
   </Style>
   <Style Selector="Window.material-you ComboBoxItem">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
     <Setter Property="Padding" Value="14,8" />
-    <Setter Property="Margin" Value="0,1" />
+    <Setter Property="Margin" Value="0,1,16,1" />
   </Style>
   <Style Selector="Window.material-you ComboBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />

From 86c357617c1deb337be52d3deed3f26b729e5d95 Mon Sep 17 00:00:00 2001
From: adnan-bhaldar <adnanbhaldar115@gmail.com>
Date: Mon, 26 Oct 2026 10:35:09 +0530
Subject: [PATCH 2/3] fix(ui): restore plain button brushes dropped from
 Soft.axaml

---
 src/Filee.App/Styles/Soft.axaml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Filee.App/Styles/Soft.axaml b/src/Filee.App/Styles/Soft.axaml
index 7cd8410e..09341329 100644
--- a/src/Filee.App/Styles/Soft.axaml
+++ b/src/Filee.App/Styles/Soft.axaml
@@ -6,7 +6,7 @@
   Styles for Filee's own controls go into Controls.axaml.
 -->
 <Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Styles.Resources>
     <ResourceDictionary>
@@ -27,6 +27,15 @@
           <SolidColorBrush x:Key="AccentFaintBrush" Color="#177F77DD" />
           <SolidColorBrush x:Key="AccentStrongBrush" Color="#5F59A6" />
           <SolidColorBrush x:Key="OnAccentBrush" Color="#FFFFFF" />
+          <!-- Plain buttons: the surface with a thin border, so only a disabled control is a flat grey (#524).
+               ThemeService gives them a theme's own surface (Material You, theme.json). -->
+
+          <SolidColorBrush x:Key="ButtonBackground" Color="#FFFFFF" />
+          <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#EFEDE6" />
+          <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#E6E3DA" />
+          <SolidColorBrush x:Key="ButtonBorderBrush" Color="#29000000" />
+          <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#3D000000" />
+          <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#3D000000" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
           <SolidColorBrush x:Key="PageBrush" Color="#1B1B19" />
@@ -44,6 +53,12 @@
           <SolidColorBrush x:Key="AccentFaintBrush" Color="#177F77DD" />
           <SolidColorBrush x:Key="AccentStrongBrush" Color="#5F59A6" />
           <SolidColorBrush x:Key="OnAccentBrush" Color="#FFFFFF" />
+          <SolidColorBrush x:Key="ButtonBackground" Color="#262624" />
+          <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#31312E" />
+          <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#3A3A36" />
+          <SolidColorBrush x:Key="ButtonBorderBrush" Color="#38FFFFFF" />
+          <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#4DFFFFFF" />
+          <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#4DFFFFFF" />
         </ResourceDictionary>
       </ResourceDictionary.ThemeDictionaries>
 

From 5dcefdda695b4fc22953ebdbbde210e941cbd5b7 Mon Sep 17 00:00:00 2001
From: adnan-bhaldar <adnanbhaldar115@gmail.com>
Date: Mon, 26 Oct 2026 11:38:25 +0530
Subject: [PATCH 3/3] fix(ui): keep short dropdowns full width and restore
 xmlns:x indentation

---
 src/Filee.App/Styles/Soft.axaml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Filee.App/Styles/Soft.axaml b/src/Filee.App/Styles/Soft.axaml
index 09341329..1683ce1b 100644
--- a/src/Filee.App/Styles/Soft.axaml
+++ b/src/Filee.App/Styles/Soft.axaml
@@ -6,7 +6,7 @@
   Styles for Filee's own controls go into Controls.axaml.
 -->
 <Styles xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Styles.Resources>
     <ResourceDictionary>
@@ -247,17 +247,21 @@
   <!-- ───────── Dropdown lists (ComboBox): rows are rounded and inset, so the selected / hovered row sits inside the
        rounded popup instead of poking out of its corners. The popup takes the Softness radius (SoftRadius) and the
        rows the smaller one (SoftRadiusSmall), so both follow the Theme page's Softness, down to sharp corners. ───────── -->
-  <!-- No padding on the right of the popup and 16px of margin on the right of each row instead: the scrollbar floats
-       over the list (thin, growing on hover), so the rows end before it rather than running underneath. -->
   <Style Selector="ComboBox /template/ Border#PopupBorder">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadius}" />
-    <Setter Property="Padding" Value="6,6,0,6" />
+    <Setter Property="Padding" Value="6" />
   </Style>
   <Style Selector="ComboBoxItem">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
-    <Setter Property="Margin" Value="0,1,16,1" />
+    <Setter Property="Margin" Value="0,1" />
+  </Style>
+  <!-- The popup's scrollbar takes its own column (only when the list is long enough to need one), so the selected /
+       hovered row ends before it and a short dropdown keeps its full width. -->
+  <Style Selector="ComboBox /template/ ScrollViewer">
+    <Setter Property="AllowAutoHide" Value="False" />
   </Style>
 
+
   <!-- ───────── Page content fade-in (keyframes can't animate RenderTransform, so Margin slides) ───────── -->
   <Style Selector="ContentControl.page > :is(Control)">
     <Style.Animations>
@@ -475,13 +479,13 @@
     <Setter Property="Background" Value="{DynamicResource SurfaceBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SubtleBorderBrush}" />
     <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="6,6,0,6" />
+    <Setter Property="Padding" Value="6" />
     <Setter Property="BoxShadow" Value="{DynamicResource CardShadow}" />
   </Style>
   <Style Selector="Window.material-you ComboBoxItem">
     <Setter Property="CornerRadius" Value="{DynamicResource SoftRadiusSmall}" />
     <Setter Property="Padding" Value="14,8" />
-    <Setter Property="Margin" Value="0,1,16,1" />
+    <Setter Property="Margin" Value="0,1" />
   </Style>
   <Style Selector="Window.material-you ComboBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />