feat(workspace): pop-out viewer window and long-document navigation

crates/app/src/app_settings/mod.rs

@@ -791,7 +791,7 @@ fn previews_group(cx: &App) -> SettingGroup {
                                     };
                                     cx.update(|cx| {
                                         cx.set_global(CacheCleared(outcome.into()));
-                                        cx.refresh_windows();
+                                        preview::forget_all(cx);
                                     });
                                 })
                                 .detach();

crates/app/src/assets.rs

@@ -1,14 +1,15 @@
 //! Our own icons in front of `gpui_component_assets`, which is otherwise the only asset source.
 //! The bundled icon set has no filled panel glyphs (the title bar's "this dock is open" state) and
-//! no picture glyph (visual search), so those SVGs are ours, copied from Lucide.
+//! no picture glyph (visual search), and none of the pop-out viewer's window, pin or missing-file
+//! glyphs, nor the viewer's fit-to-width glyph, so those SVGs are ours, copied from Lucide.
 
 use std::borrow::Cow;
 
 use gpui::{AssetSource, Result, SharedString};
 
 pub struct Assets;
 
-const OWN: [(&str, &str); 5] = [
+const OWN: [(&str, &str); 10] = [
     (
         "icons/history.svg",
         include_str!("../../../assets/icons/history.svg"),
@@ -29,6 +30,26 @@ const OWN: [(&str, &str); 5] = [
         "icons/image.svg",
         include_str!("../../../assets/icons/image.svg"),
     ),
+    (
+        "icons/app-window.svg",
+        include_str!("../../../assets/icons/app-window.svg"),
+    ),
+    (
+        "icons/pin.svg",
+        include_str!("../../../assets/icons/pin.svg"),
+    ),
+    (
+        "icons/pin-filled.svg",
+        include_str!("../../../assets/icons/pin-filled.svg"),
+    ),
+    (
+        "icons/file-x.svg",
+        include_str!("../../../assets/icons/file-x.svg"),
+    ),
+    (
+        "icons/move-horizontal.svg",
+        include_str!("../../../assets/icons/move-horizontal.svg"),
+    ),
 ];
 
 impl AssetSource for Assets {

crates/app/src/main.rs

@@ -221,6 +221,8 @@ impl App {
                 return false;
             }
             flush_all_state(cx);
+            // Its table goes with this window, and on Windows and Linux an open window keeps the app running.
+            workspace::close_pop_out(cx);
             true
         });
 

crates/app/src/status_items/mod.rs

@@ -3,6 +3,7 @@ pub mod markup;
 mod new_files;
 mod panel_buttons;
 mod plugin_bar;
+mod previews_busy;
 
 use cell_location::CellLocation;
 use gpui::*;
@@ -11,6 +12,7 @@ use new_files::NewFilesButton;
 use panel_buttons::PanelButtons;
 use plugin_api::{Bar, BarContributions, Side};
 pub use plugin_bar::PluginBar;
+use previews_busy::PreviewsBusy;
 use window_wrapper::{BarRegistry, status_bar::StatusBarRegistry};
 use workspace::{BarSide, DockToggleButton, PANELS};
 
@@ -64,6 +66,13 @@ pub fn build_status_bar_registry(cx: &mut App, dock: WeakEntity<DockArea>) -> St
         !BarContributions::at(Bar::Status, Side::Right, cx).is_empty()
     });
 
+    let previews_busy = cx.new(PreviewsBusy::new);
+    registry
+        .items_mut()
+        .add_right_if(previews_busy.clone(), move |cx| {
+            previews_busy.read(cx).shown > 0
+        });
+
     // Text readout of the table's selected cell.
     let cell_location = cx.new(CellLocation::new);
     registry.items_mut().add_right(cell_location);

crates/app/src/status_items/new_files.rs

@@ -40,12 +40,7 @@ impl Render for NewFilesButton {
             .label(format!("New files ({count})"))
             .tooltip("Files in the files folder that no row links to")
             .on_click(|_, window, cx| {
-                if let Some(table) = cx
-                    .try_global::<TablePanelHandle>()
-                    .and_then(|handle| handle.0.upgrade())
-                {
-                    table.update(cx, |table, cx| table.import_new_files(window, cx));
-                }
+                TablePanelHandle::update(cx, |table, cx| table.import_new_files(window, cx));
             })
             .into_any_element()
     }

crates/app/src/status_items/previews_busy.rs

@@ -0,0 +1,51 @@
+//! Right-side status-bar readout: a spinner and a count while previews are decoding, so a gallery
+//! filling in reads as work under way rather than a slow app.
+
+use std::time::Duration;
+
+use gpui::*;
+use gpui_component::{Sizable as _, h_flex, spinner::Spinner};
+
+pub struct PreviewsBusy {
+    pub shown: usize,
+    _poll: Task<()>,
+}
+
+impl PreviewsBusy {
+    /// ponytail: polls, since decodes finish on a background thread that cannot notify a view.
+    /// Four cheap loads a second, and a re-render only when the count moves.
+    pub fn new(cx: &mut Context<Self>) -> Self {
+        let _poll = cx.spawn(async move |this, cx| {
+            loop {
+                cx.background_executor()
+                    .timer(Duration::from_millis(250))
+                    .await;
+                let now = preview::decoding();
+                let alive = this.update(cx, |this, cx| {
+                    if this.shown == now {
+                        return;
+                    }
+                    // Appearing or leaving changes the bar's dividers, which only the bar redraws.
+                    if (this.shown == 0) != (now == 0) {
+                        cx.refresh_windows();
+                    }
+                    this.shown = now;
+                    cx.notify();
+                });
+                if alive.is_err() {
+                    break;
+                }
+            }
+        });
+        Self { shown: 0, _poll }
+    }
+}
+
+impl Render for PreviewsBusy {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        h_flex()
+            .gap_1()
+            .child(Spinner::new().xsmall())
+            .child(format!("Loading previews ({})", self.shown))
+    }
+}

crates/onboarding/src/lib.rs

@@ -706,18 +706,13 @@ fn show_me(guide: &Entity<Guide>, task: Task, window: &mut Window, cx: &mut App)
         }
         Task::AddFilesFolder => {
             let blank = guide.read(cx).kind == GuideKind::Blank;
-            if let Some(table) = cx
-                .try_global::<table::TablePanelHandle>()
-                .and_then(|handle| handle.0.upgrade())
-            {
-                table.update(cx, |table, cx| {
-                    if blank {
-                        table.choose_import_paths(window, cx)
-                    } else {
-                        table.choose_files_root(window, cx)
-                    }
-                });
-            }
+            table::TablePanelHandle::update(cx, |table, cx| {
+                if blank {
+                    table.choose_import_paths(window, cx)
+                } else {
+                    table.choose_files_root(window, cx)
+                }
+            });
         }
         Task::OpenRow | Task::SelectRow => {
             ensure_visible(guide, DETAILS_META.name, window, cx);

crates/preview/Cargo.toml

@@ -26,6 +26,10 @@ pdfium-render = { version = "0.9.3", default-features = false, features = ["pdfi
 # ship two whole symphonia trees in the binary. Move both together or neither.
 symphonia = { version = "0.5.5", default-features = false, features = ["mp3", "aac", "alac", "isomp4", "ogg", "vorbis", "flac", "wav", "pcm"] }
 
+[features]
+# Test fixtures other crates' tests use, such as `playback::silent_wav`.
+test-support = []
+
 [dev-dependencies]
 # `#[gpui::test]`, TestAppContext, and run_test are all behind this feature.
 gpui = { workspace = true, features = ["test-support"] }

crates/preview/src/audio.rs

@@ -132,22 +132,7 @@ mod tests {
     /// rather than erroring in a way that would look the same as an unreadable file.
     #[test]
     fn a_valid_recording_without_artwork_is_not_an_error() {
-        // 44-byte canonical WAV header describing one sample of silence.
-        let mut wav = Vec::new();
-        wav.extend(b"RIFF");
-        wav.extend(36u32.to_le_bytes());
-        wav.extend(b"WAVEfmt ");
-        wav.extend(16u32.to_le_bytes());
-        wav.extend(1u16.to_le_bytes()); // PCM
-        wav.extend(1u16.to_le_bytes()); // mono
-        wav.extend(8000u32.to_le_bytes());
-        wav.extend(16000u32.to_le_bytes());
-        wav.extend(2u16.to_le_bytes());
-        wav.extend(16u16.to_le_bytes());
-        wav.extend(b"data");
-        wav.extend(2u32.to_le_bytes());
-        wav.extend(0u16.to_le_bytes());
-
+        let wav = crate::playback::silent_wav(1);
         let path = std::env::temp_dir().join("qrate-audio-silent.wav");
         std::fs::write(&path, &wav).unwrap();
         assert!(audio::cover(&path).is_none(), "no artwork, but no panic");

crates/preview/src/cache.rs

@@ -52,6 +52,10 @@ pub fn dir() -> Option<PathBuf> {
     .clone()
 }
 
+/// Bumped when a decode changes what an unchanged file looks like, so every old entry misses.
+/// 1: raster thumbnails turned upright by their EXIF orientation.
+const FORMAT: u32 = 1;
+
 /// Identity of one cached rendering. The file's length and mtime are in the hash, so editing or
 /// replacing a source file misses rather than serving the old picture — which is why nothing here
 /// needs an invalidation pass.
@@ -61,6 +65,7 @@ pub fn dir() -> Option<PathBuf> {
 pub fn key(path: &Path, max_edge: u32, page: usize) -> Option<String> {
     let meta = fs::metadata(path).ok()?;
     let mut hasher = DefaultHasher::new();
+    FORMAT.hash(&mut hasher);
     path.hash(&mut hasher);
     meta.len().hash(&mut hasher);
     meta.modified().ok()?.hash(&mut hasher);