Implement save-view-as-screenshot on web

rerun-io · Dec 16, 2024 · 1eed6b9 · 1eed6b9
1 parent b68b4e9
commit 1eed6b9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/crates/viewer/re_context_menu/src/actions/mod.rs b/crates/viewer/re_context_menu/src/actions/mod.rs
@@ -7,8 +7,6 @@ pub(super) mod move_contents_to_new_container;
 pub(super) mod remove;
 pub(super) mod show_hide;
 
-#[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
 mod screenshot_action;
 
-#[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
 pub use screenshot_action::ScreenshotAction;
diff --git a/crates/viewer/re_context_menu/src/actions/screenshot_action.rs b/crates/viewer/re_context_menu/src/actions/screenshot_action.rs
@@ -3,9 +3,9 @@ use re_viewer_context::{Item, PublishedViewInfo, ScreenshotTarget, ViewId, ViewR
 use crate::{ContextMenuAction, ContextMenuContext};
 
 /// View screenshot action.
-#[cfg(not(target_arch = "wasm32"))]
 pub enum ScreenshotAction {
     /// Screenshot the view, and copy the results to clipboard.
+    #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
     CopyScreenshot,
 
     /// Screenshot the view, and save the results to disk.
@@ -39,6 +39,7 @@ impl ContextMenuAction for ScreenshotAction {
 
     fn label(&self, _ctx: &ContextMenuContext<'_>) -> String {
         match self {
+            #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
             Self::CopyScreenshot => "Copy screenshot".to_owned(),
             Self::SaveScreenshot => "Save screenshot…".to_owned(),
         }
@@ -59,6 +60,7 @@ impl ContextMenuAction for ScreenshotAction {
         let rect = rect.shrink(1.75); // Hacky: Shrink so we don't accidentally include the border of the view.
 
         let target = match self {
+            #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
             Self::CopyScreenshot => ScreenshotTarget::CopyToClipboard,
             Self::SaveScreenshot => ScreenshotTarget::SaveToDisk,
         };

diff --git a/crates/viewer/re_context_menu/src/lib.rs b/crates/viewer/re_context_menu/src/lib.rs
@@ -113,8 +113,8 @@ fn action_list(
                 Box::new(HideAction),
                 Box::new(RemoveAction),
             ],
-            #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
             vec![
+                #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
                 Box::new(actions::ScreenshotAction::CopyScreenshot),
                 Box::new(actions::ScreenshotAction::SaveScreenshot),
             ],

diff --git a/crates/viewer/re_viewer/src/app.rs b/crates/viewer/re_viewer/src/app.rs
@@ -1596,7 +1596,6 @@ impl App {
         false
     }
 
-    #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
     fn process_screenshot_result(
         &mut self,
         image: &Arc<egui::ColorImage>,
@@ -1623,8 +1622,8 @@ impl App {
             };
 
             match target {
+                #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
                 re_viewer_context::ScreenshotTarget::CopyToClipboard => {
-                    #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
                     re_viewer_context::Clipboard::with(|clipboard| {
                         clipboard.set_image(
                             [rgba.width(), rgba.height()],
@@ -1656,6 +1655,7 @@ impl App {
                 }
             }
         } else {
+            #[cfg(not(target_arch = "wasm32"))] // no full-app screenshotting on web
             self.screenshotter.save(image);
         }
     }
@@ -1951,7 +1951,6 @@ impl eframe::App for App {
         self.store_hub = Some(store_hub);
 
         // Check for returned screenshot:
-        #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): screenshotting on web
         egui_ctx.input(|i| {
             for event in &i.raw.events {
                 if let egui::Event::Screenshot {

diff --git a/crates/viewer/re_viewer_context/src/lib.rs b/crates/viewer/re_viewer_context/src/lib.rs
@@ -150,6 +150,7 @@ pub struct ScreenshotInfo {
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ScreenshotTarget {
     /// The screenshot will be copied to the clipboard.
+    #[cfg(not(target_arch = "wasm32"))] // TODO(#8264): copy-to-screenshot on web
     CopyToClipboard,
 
     /// The screenshot will be saved to disk.