Skip to content

feat(clipboard): fix interaction with freeze and select feature: Issu… #4

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

Merged
Gigas002 merged 1 commit into from
Apr 11, 2024
Merged

feat(clipboard): fix interaction with freeze and select feature: Issu… #4

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
15 changes: 12 additions & 3 deletions libwayshot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,13 @@ impl WayshotConnection {
Ok(frame_copies)
}

fn overlay_frames(&self, frames: &[(FrameCopy, FrameGuard, OutputInfo)]) -> Result<()> {
/// Create a layer shell surface for each output,
/// render the screen captures on them and use the callback to select a region from them
fn overlay_frames_and_select_region(
&self,
frames: &[(FrameCopy, FrameGuard, OutputInfo)],
callback: Box<dyn Fn() -> Result<LogicalRegion, Error>>,
) -> Result<LogicalRegion> {
let mut state = LayerShellState {
configured_outputs: HashSet::new(),
};
Expand Down Expand Up @@ -491,7 +497,10 @@ impl WayshotConnection {
Ok(())
})?;
}
Ok(())
let callback_result = callback();
layer_shell.destroy();
event_queue.blocking_dispatch(&mut state)?;
callback_result
}

/// Take a screenshot from the specified region.
Expand Down Expand Up @@ -547,7 +556,7 @@ impl WayshotConnection {
RegionCapturer::Outputs(outputs) => outputs.as_slice().try_into()?,
RegionCapturer::Region(region) => region,
RegionCapturer::Freeze(callback) => {
self.overlay_frames(&frames).and_then(|_| callback())?
self.overlay_frames_and_select_region(&frames, callback)?
}
};

Expand Down