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).
This commit is contained in:
+1
-1
Submodule gpui updated: 3870d6da06...dea33c713f
@@ -992,6 +992,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn save_writes_only_entries_that_differ_from_default() {
|
fn save_writes_only_entries_that_differ_from_default() {
|
||||||
let _guard = shortcuts_test_lock().lock().unwrap();
|
let _guard = shortcuts_test_lock().lock().unwrap();
|
||||||
|
reset_all_custom_shortcuts();
|
||||||
let dir = temp_dir("diff");
|
let dir = temp_dir("diff");
|
||||||
let path = format!("{dir}/shortcuts");
|
let path = format!("{dir}/shortcuts");
|
||||||
|
|
||||||
|
|||||||
+5
-2
@@ -47,8 +47,8 @@ use gpui::timeline::{
|
|||||||
ClipData, ClipId, Frame, FrameRange, TimelineEvent, TimelineView, TrackData,
|
ClipData, ClipId, Frame, FrameRange, TimelineEvent, TimelineView, TrackData,
|
||||||
};
|
};
|
||||||
use gpui::{
|
use gpui::{
|
||||||
div, prelude::*, px, size, App, AsyncWindowContext, Bounds, Context, Entity, PathPromptOptions,
|
colors::DefaultColors, div, prelude::*, px, size, App, AsyncWindowContext, Bounds, Context,
|
||||||
Render, Window, WindowBounds, WindowOptions,
|
Entity, PathPromptOptions, Render, Window, WindowBounds, WindowOptions,
|
||||||
};
|
};
|
||||||
use gpui_widgets::audio_meter::{AudioLevelMeter, MeterOrientation};
|
use gpui_widgets::audio_meter::{AudioLevelMeter, MeterOrientation};
|
||||||
use gpui_widgets::dialog::progress::{progress_dialog, ProgressContent};
|
use gpui_widgets::dialog::progress::{progress_dialog, ProgressContent};
|
||||||
@@ -2214,6 +2214,9 @@ impl<E: AppEngine> Render for OakApp<E> {
|
|||||||
.size_full()
|
.size_full()
|
||||||
.flex()
|
.flex()
|
||||||
.flex_col()
|
.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);
|
.track_focus(&self.shell_focus);
|
||||||
// The shell's keyboard dispatch layer: the global key bindings
|
// The shell's keyboard dispatch layer: the global key bindings
|
||||||
// (registered in `new` from the action registry) dispatch gpui
|
// (registered in `new` from the action registry) dispatch gpui
|
||||||
|
|||||||
@@ -165,12 +165,13 @@ impl ClipDecorator for OakClipDecorator {
|
|||||||
waveform.samples_per_point.max(1) as f32 / waveform.sample_rate.max(1) as f32;
|
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;
|
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 {
|
let color = Hsla {
|
||||||
h: 0.55,
|
h: 0.38,
|
||||||
s: 0.5,
|
s: 0.5,
|
||||||
l: 0.55,
|
l: 0.28,
|
||||||
a: 0.85,
|
a: 0.9,
|
||||||
};
|
};
|
||||||
for x in 0..width {
|
for x in 0..width {
|
||||||
let t = x as f32 / width as f32;
|
let t = x as f32 / width as f32;
|
||||||
|
|||||||
Reference in New Issue
Block a user