Skip to content
Merged
Changes from all commits
Commits
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
95 changes: 41 additions & 54 deletions apps/desktop-gpui/src/editor_clips.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,58 +700,38 @@ impl EditorWindow {

// -- Thumbnails ------------------------------------------------------------

/// Queue background decodes for every card without a picture, at most
/// [`MAX_THUMBNAIL_LOADS`] in flight -- each completion notifies, which
/// re-runs this and pulls the next one off the "queue".
fn request_clip_thumbnails(&mut self, cx: &mut Context<Self>) {
let wanted: Vec<(ThumbKey, f64)> = self
.clip_segments()
.iter()
.map(|segment| {
(
(
segment.recording_clip,
(segment.start * 1000.0).round() as i64,
),
segment.start,
)
})
.collect();
for (key, start) in wanted {
if self.clips.thumbs_inflight >= MAX_THUMBNAIL_LOADS {
break;
}
if self.clips.thumbs.contains_key(&key) {
continue;
}
self.clips.thumbs.insert(key, ClipThumb::Loading);
self.clips.thumbs_inflight += 1;
let project_path = self.project_path.clone();
cx.spawn(async move |this, cx| {
let decoded = cx
.background_executor()
.spawn(async move { decode_clip_thumbnail(&project_path, key.0, start) })
.await;
this.update(cx, |this, cx| {
this.clips.thumbs_inflight = this.clips.thumbs_inflight.saturating_sub(1);
let entry = match decoded {
Ok(image) => ClipThumb::Ready(image),
Err(error) => {
tracing::warn!(
segment = key.0,
start_ms = key.1,
"clip thumbnail decode failed: {error}"
);
ClipThumb::Failed
}
};
this.clips.thumbs.insert(key, entry);
cx.notify();
})
.ok();
})
.detach();
fn request_clip_thumbnail(&mut self, key: ThumbKey, start: f64, cx: &mut Context<Self>) {
if self.clips.thumbs_inflight >= MAX_THUMBNAIL_LOADS || self.clips.thumbs.contains_key(&key)
{
return;
}
self.clips.thumbs.insert(key, ClipThumb::Loading);
self.clips.thumbs_inflight += 1;
let project_path = self.project_path.clone();
cx.spawn(async move |this, cx| {
let decoded = cx
.background_executor()
.spawn(async move { decode_clip_thumbnail(&project_path, key.0, start) })
.await;
this.update(cx, |this, cx| {
this.clips.thumbs_inflight = this.clips.thumbs_inflight.saturating_sub(1);
let entry = match decoded {
Ok(image) => ClipThumb::Ready(image),
Err(error) => {
tracing::warn!(
segment = key.0,
start_ms = key.1,
"clip thumbnail decode failed: {error}"
);
ClipThumb::Failed
}
};
this.clips.thumbs.insert(key, entry);
cx.notify();
})
.ok();
})
.detach();
}

// -- The sidebar ------------------------------------------------------------
Expand All @@ -760,8 +740,6 @@ impl EditorWindow {
/// mode is open. Same `ml-2 w-104` wrapper the config sidebar carries, and
/// the same card.
pub(crate) fn render_clips_sidebar(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
self.request_clip_thumbnails(cx);

div()
.w(px(crate::editor_window::SIDEBAR_WIDTH))
.flex_none()
Expand Down Expand Up @@ -1064,9 +1042,18 @@ impl EditorWindow {
let group: SharedString = SharedString::from(format!("clip-card-{index}"));
let probe = {
let cell = self.clips.card_bounds.clone();
let editor = cx.weak_entity();
let start = segment.start;
gpui::canvas(
move |bounds, _window, _cx| {
move |bounds, window, cx| {
cell.borrow_mut().push(ClipCardBounds { index, bounds });
if bounds.intersects(&window.content_mask().bounds) {
editor
.update(cx, |editor, cx| {
editor.request_clip_thumbnail(thumb_key, start, cx);
})
.ok();
}
},
|_, _, _, _| {},
)
Expand Down
Loading