Skip to content

fix(editor): span the timeline minimap across the full ruler width #2958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ectropy wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −9
Open

fix(editor): span the timeline minimap across the full ruler width #2958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions apps/desktop-gpui/src/editor_timeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,10 @@ pub fn new_segment_min_duration(secs_per_pixel: f64) -> f64 {
}

/// The minimap's chip floor (`TL/Minimap.tsx:9`), the height of its hit strip
/// and the 4px indicator drawn inside that strip, and the width it is allowed
/// to take in the card's bottom-right corner.
/// and the 4px indicator drawn inside that strip.
const MINIMAP_MIN_CHIP_WIDTH: f32 = 20.;
pub const MINIMAP_HEIGHT: f32 = 10.;
pub const MINIMAP_BAR_HEIGHT: f32 = 4.;
pub const MINIMAP_MAX_WIDTH: f32 = 78.;

/// The edge fade (`TL/index.tsx:1103-1106`).

Expand Down Expand Up @@ -2091,13 +2089,8 @@ pub fn render_ruler(theme: &Theme, view: TimelineView, viewport_width: f32) -> A
.into_any_element()
}

/// The minimap's strip: pinned to the card's inner right edge, at most
/// [`MINIMAP_MAX_WIDTH`] wide. Returns its window x and its width, which the
/// drag maths and the drawn bar have to agree on.
pub fn minimap_bounds(viewport_width: f32) -> (f32, f32) {
let strip = ruler_width(viewport_width);
let width = MINIMAP_MAX_WIDTH.min(strip);
(content_left() + strip - width, width)
(content_left(), ruler_width(viewport_width))
}

pub fn minimap_chip(transform: Transform, total_duration: f64, bar_width: f32) -> (f32, f32) {
Expand Down Expand Up @@ -5711,6 +5704,15 @@ mod tests {

// -- The minimap --------------------------------------------------------

#[test]
fn the_minimap_spans_the_ruler() {
for viewport_width in [800., 1275., 2560.] {
let (left, width) = minimap_bounds(viewport_width);
assert_eq!(left, content_left());
assert_eq!(width, ruler_width(viewport_width));
}
}

#[test]
fn the_minimap_chip_never_shrinks_below_its_floor() {
let (_, chip) = minimap_chip(
Expand Down
Loading