Skip to content
Open
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions apps/desktop-gpui/assets/icons/minimize.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions apps/desktop-gpui/src/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ const ICONS: &[(&str, &[u8])] = assets!("icons":
"download.svg",
"flip-vertical-2.svg",
"maximize.svg",
"minimize.svg",
"mouse-pointer-2.svg",
"mouse-pointer-ban.svg",
"move.svg",
Expand Down Expand Up @@ -334,6 +335,7 @@ mod tests {
include_str!("editor_clips.rs"),
// The export page's destination cards and share-status glyphs.
include_str!("editor_export.rs"),
include_str!("editor_watch.rs"),
// The screenshot editor's toolbar, popovers and zoom HUD; the
// annotation module names the tool and layer glyphs.
include_str!("screenshot_editor.rs"),
Expand Down
5 changes: 4 additions & 1 deletion apps/desktop-gpui/src/editor_canvas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,10 @@ impl EditorWindow {
/// `overlayVisible()` (`:238`): only while paused, and only once the
/// renderer has reported a layout.
pub(crate) fn canvas_overlay_visible(&self) -> bool {
!self.playing && self.frame_layout.is_some() && self.crop.is_none()
!self.playing
&& self.frame_layout.is_some()
&& self.crop.is_none()
&& !self.watch_preview_open
}

fn scene_mode_at(&self, time: f64) -> SceneMode {
Expand Down
1 change: 1 addition & 0 deletions apps/desktop-gpui/src/editor_crop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,7 @@ impl EditorWindow {
if self.crop.is_some() {
return;
}
self.dismiss_watch_preview(cx);
let Some(target) = self.display_resolution() else {
tracing::warn!("crop: no display recording to crop");
return;
Expand Down
1 change: 1 addition & 0 deletions apps/desktop-gpui/src/editor_export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ impl EditorWindow {
}

pub(crate) fn open_export(&mut self, window: &mut Window, cx: &mut Context<Self>) {
self.dismiss_watch_preview(cx);
if self.playing {
self.toggle_play_from_crop(cx);
}
Expand Down
Loading
Loading