From cc0a15919f1b5ff22d2dc4e1c4d2bf4db52cc760 Mon Sep 17 00:00:00 2001
From: Mike Solar <iam@mikesolar.cn>
Date: Thu, 20 Aug 2026 17:43:44 +0800
Subject: [PATCH] style(app): apply the refreshed theme, drop-ghost timeline
 shell, misc

- Root view paints the near-black base so dock gaps match.
- Waveform trace follows the deep-green design color.
- actions.rs: reset the shortcut overrides in
  save_writes_only_entries_that_differ_from_default (pre-existing
  flake: a leaked override from a previous test poisoned the shared
  lock under parallel test order).
---
 gpui                  | 2 +-
 src/actions.rs        | 1 +
 src/app.rs            | 7 +++++--
 src/oakui/waveform.rs | 9 +++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gpui b/gpui
index 3870d6da0..dea33c713 160000
--- a/gpui
+++ b/gpui
@@ -1 +1 @@
-Subproject commit 3870d6da06fd67f46fed0a590ba4b5a4270ba555
+Subproject commit dea33c713f3eeaade8adf3a435d1aeae68cb394e
diff --git a/src/actions.rs b/src/actions.rs
index 8b0dc5b6c..5fc0b752e 100644
--- a/src/actions.rs
+++ b/src/actions.rs
@@ -992,6 +992,7 @@ mod tests {
 	#[test]
 	fn save_writes_only_entries_that_differ_from_default() {
 		let _guard = shortcuts_test_lock().lock().unwrap();
+		reset_all_custom_shortcuts();
 		let dir = temp_dir("diff");
 		let path = format!("{dir}/shortcuts");
 
diff --git a/src/app.rs b/src/app.rs
index 7785c8628..a001360d0 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -47,8 +47,8 @@ use gpui::timeline::{
 	ClipData, ClipId, Frame, FrameRange, TimelineEvent, TimelineView, TrackData,
 };
 use gpui::{
-	div, prelude::*, px, size, App, AsyncWindowContext, Bounds, Context, Entity, PathPromptOptions,
-	Render, Window, WindowBounds, WindowOptions,
+	colors::DefaultColors, div, prelude::*, px, size, App, AsyncWindowContext, Bounds, Context,
+	Entity, PathPromptOptions, Render, Window, WindowBounds, WindowOptions,
 };
 use gpui_widgets::audio_meter::{AudioLevelMeter, MeterOrientation};
 use gpui_widgets::dialog::progress::{progress_dialog, ProgressContent};
@@ -2214,6 +2214,9 @@ impl<E: AppEngine> Render for OakApp<E> {
 			.size_full()
 			.flex()
 			.flex_col()
+			// The shell paints the design's near-black base behind the dock;
+			// panels and chrome layer their own fills on top.
+			.bg(cx.default_colors().background)
 			.track_focus(&self.shell_focus);
 		// The shell's keyboard dispatch layer: the global key bindings
 		// (registered in `new` from the action registry) dispatch gpui
diff --git a/src/oakui/waveform.rs b/src/oakui/waveform.rs
index c4fc397a1..9df24c7f5 100644
--- a/src/oakui/waveform.rs
+++ b/src/oakui/waveform.rs
@@ -165,12 +165,13 @@ impl ClipDecorator for OakClipDecorator {
 			waveform.samples_per_point.max(1) as f32 / waveform.sample_rate.max(1) as f32;
 		let frames_per_point = secs_per_point * self.cache.fps;
 
-		// Sample one peak per horizontal pixel column.
+		// Sample one peak per horizontal pixel column. The design draws the
+		// waveform as a darker green against the clip's green body.
 		let color = Hsla {
-			h: 0.55,
+			h: 0.38,
 			s: 0.5,
-			l: 0.55,
-			a: 0.85,
+			l: 0.28,
+			a: 0.9,
 		};
 		for x in 0..width {
 			let t = x as f32 / width as f32;