openclaw
diff --git a/‎src/OpenClaw.Tray.WinUI/App.xaml‎
Lines changed: 52 additions & 0 deletions b/‎src/OpenClaw.Tray.WinUI/App.xaml‎
Lines changed: 52 additions & 0 deletions
diff --git a/‎src/OpenClaw.Tray.WinUI/Chat/OpenClawChatRoot.cs‎
Lines changed: 38 additions & 1 deletion b/‎src/OpenClaw.Tray.WinUI/Chat/OpenClawChatRoot.cs‎
Lines changed: 38 additions & 1 deletion
diff --git a/‎src/OpenClaw.Tray.WinUI/Chat/OpenClawChatTimeline.cs‎
Lines changed: 13 additions & 2 deletions b/‎src/OpenClaw.Tray.WinUI/Chat/OpenClawChatTimeline.cs‎
Lines changed: 13 additions & 2 deletions
@@ -20,14 +20,66 @@
                 <ResourceDictionary x:Key="Default">
                     <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemAccentColorLight2}" />
                     <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource ControlStrongFillColorDefault}" />
+
+                    <!-- FunctionalUI resolves a brush for a target ElementTheme by walking the
+                         app-level ThemeDictionaries; the framework's XamlControlsResources
+                         brushes are not surfaced through that enumerable walk, so a control
+                         rendering dark kept the light snapshot (the composer read as light on
+                         a dark page). Re-declaring the exact framework keys here materializes
+                         them per theme with identical values (each aliases its built-in color
+                         token), so the walk flips them correctly. No hardcoded colors. -->
+                    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{ThemeResource SolidBackgroundFillColorBase}" />
+                    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{ThemeResource ControlFillColorDefault}" />
+                    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
+                    <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{ThemeResource SubtleFillColorSecondary}" />
+                    <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{ThemeResource SubtleFillColorTertiary}" />
+                    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{ThemeResource TextFillColorSecondary}" />
+
+                    <!-- Composer scrim: the chat timeline dissolves into the composer dock via a
+                         vertical fade from transparent to the base surface fill. FunctionalUI
+                         resolves this as a whole brush per ElementTheme and reads it out of the
+                         visual tree, so the stops use LITERAL colors (a {ThemeResource} color
+                         would re-resolve against the ambient app theme and read light on a dark
+                         page). The values mirror SolidBackgroundFillColorBase (dark #202020) so
+                         the fade lands seamlessly on the dock. -->
+                    <LinearGradientBrush x:Key="ChatComposerFadeBrush" StartPoint="0,0" EndPoint="0,1">
+                        <GradientStop Offset="0" Color="#00202020" />
+                        <GradientStop Offset="1" Color="#FF202020" />
+                    </LinearGradientBrush>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemAccentColorDark1}" />
                     <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource ControlStrongFillColorDefault}" />
+
+                    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{ThemeResource SolidBackgroundFillColorBase}" />
+                    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{ThemeResource ControlFillColorDefault}" />
+                    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
+                    <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{ThemeResource SubtleFillColorSecondary}" />
+                    <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{ThemeResource SubtleFillColorTertiary}" />
+                    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{ThemeResource TextFillColorSecondary}" />
+
+                    <!-- Light mirror of ChatComposerFadeBrush (SolidBackgroundFillColorBase light #F3F3F3). -->
+                    <LinearGradientBrush x:Key="ChatComposerFadeBrush" StartPoint="0,0" EndPoint="0,1">
+                        <GradientStop Offset="0" Color="#00F3F3F3" />
+                        <GradientStop Offset="1" Color="#FFF3F3F3" />
+                    </LinearGradientBrush>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
                     <SolidColorBrush x:Key="SetupIndicatorAccentBrush" Color="{ThemeResource SystemColorHighlightColor}" />
                     <SolidColorBrush x:Key="SetupInactiveDotBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
+
+                    <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{ThemeResource SolidBackgroundFillColorBase}" />
+                    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{ThemeResource ControlFillColorDefault}" />
+                    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
+                    <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{ThemeResource SubtleFillColorSecondary}" />
+                    <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{ThemeResource SubtleFillColorTertiary}" />
+                    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{ThemeResource TextFillColorSecondary}" />
+
+                    <!-- High-contrast follows the system window color so the scrim stays legible. -->
+                    <LinearGradientBrush x:Key="ChatComposerFadeBrush" StartPoint="0,0" EndPoint="0,1">
+                        <GradientStop Offset="0" Color="Transparent" />
+                        <GradientStop Offset="1" Color="{ThemeResource SystemColorWindowColor}" />
+                    </LinearGradientBrush>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
 
@@ -675,10 +675,44 @@ void SetChatSurfaceHeight(double height)
             chatSurfaceHeight.Set(Math.Round(height));
         }
 
+        // Copilot-style scrim: instead of a hard divider line, the timeline
+        // dissolves into the composer dock via a vertical gradient that runs
+        // from transparent at the top to the solid theme-base fill at the
+        // bottom. The composer dock uses that same base fill, so the fade lands
+        // seamlessly. The color is resolved from the element's ActualTheme (not
+        // Application.Resources, which snapshots the default theme) so it flips
+        // live on a runtime light/dark switch. It never captures pointer input,
+        // so scrolling and the last message stay live.
+        static Brush BuildComposerFadeBrush(ElementTheme theme)
+        {
+            // Resolve the fade as a WHOLE brush per theme rather than reading a
+            // color off a walked brush. Reading .Color out of the visual tree
+            // re-resolves any {ThemeResource} against the ambient (light) app
+            // theme, which is why the fade previously read white on a dark page.
+            // ChatComposerFadeBrush is declared with literal colors per theme in
+            // App.xaml ThemeDictionaries (which the FunctionalUI walk can reach),
+            // so it flips correctly and stays aligned with the composer dock fill.
+            // A not-yet-loaded element can report ElementTheme.Default; coerce it
+            // to Dark so resolution never falls through to a missing app-root key
+            // (Loaded/ActualThemeChanged re-apply with the real theme).
+            var resolved = theme == ElementTheme.Light ? ElementTheme.Light : ElementTheme.Dark;
+            return Theme.ResolveBrush("ChatComposerFadeBrush", resolved);
+        }
+
+        var composerFade = Border(Empty())
+            .Set(f =>
+            {
+                f.Height = 28;
+                f.VerticalAlignment = VerticalAlignment.Bottom;
+                f.IsHitTestVisible = false;
+                Theme.EnsureThemeCallback(f, () => f.Background = BuildComposerFadeBrush(f.ActualTheme));
+            });
+
         return Grid([GridSize.Star()], [GridSize.Auto, GridSize.Auto, GridSize.Star(), GridSize.Auto],
             header.Grid(row: 0, column: 0),
             divider.Grid(row: 1, column: 0),
             body.Grid(row: 2, column: 0),
+            composerFade.Grid(row: 2, column: 0),
             composer.Grid(row: 3, column: 0)
         ).OnMount(root =>
         {
@@ -881,7 +915,10 @@ Element SuggestionButton(string text) =>
                     b.Padding = new Thickness(12, 10, 12, 10);
                     b.CornerRadius = new CornerRadius(8);
                     b.IsEnabled = !suggestionsDisabled;
-                });
+                    b.BorderThickness = new Thickness(0);
+                    b.BorderBrush = null;
+                })
+                .BackgroundResource("SubtleFillColorSecondaryBrush");
 
         return Border(
             VStack(12,
 
@@ -1004,7 +1004,14 @@ static Element TimelineInset(Element child, double top = 2, double bottom = 2) =
         // window backdrop. On Mica/Acrylic the system tint is translucent,
         // so Tertiary text can fall below WCAG AA. Bump to Secondary when
         // the chat surface is transparent over a host backdrop.
-        var chatStampFg         = themeBrush("TextFillColorSecondaryBrush");
+        // Timestamps / helper captions sit directly on the window backdrop (no
+        // bubble behind them), so a snapshot from Application.Resources renders
+        // the light-theme secondary color and vanishes in dark mode. Drive this
+        // brush from the built-in TextFillColorSecondary token for the timeline
+        // root's ActualTheme instead (wired below) so it stays legible after a
+        // runtime light/dark switch.
+        var chatStampFg         = new SolidColorBrush(
+            Theme.ResolveColor("TextFillColorSecondary", ElementTheme.Default));
         var chatTextFg          = themeBrush("TextFillColorPrimaryBrush");
         // Tool chips: very subtle background tint + light border so they
         // read as a secondary surface distinct from the filled assistant
@@ -3006,7 +3013,11 @@ bool BurstIsNestable(System.Collections.Generic.List<ChatTimelineItem> b)
                 prevLastEntryIdRef.Current = lastEntryId;
                 prevEntryCountRef.Current = entryCount;
             })
-            ).Background(chatPageBg).Grid(row: 0, column: 0)
+            ).Set(rootBorder =>
+             {
+                 Theme.EnsureThemeCallback(rootBorder, () =>
+                     chatStampFg.Color = Theme.ResolveColor("TextFillColorSecondary", rootBorder.ActualTheme));
+             }).Background(chatPageBg).Grid(row: 0, column: 0)
         );
     }
 }