Preview slides on browser double-click without changing live output
This commit is contained in:
parent
f09d8ac361
commit
ce78d13d11
|
|
@ -2212,7 +2212,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pdf-presenter"
|
||||
version = "0.1.36"
|
||||
version = "0.1.37"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"chrono",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ default-members = ["crates/pdf-presenter"]
|
|||
resolver = "3"
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.36"
|
||||
version = "0.1.37"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
repository = "https://proxy.dandaedre.com/gitea/idle-org/pdf-presenter"
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@ pub fn tr<'a>(ctx: &egui::Context, text: &'a str) -> &'a str {
|
|||
"Ouvrez un PDF ou un dossier d’images pour parcourir les diapositives."
|
||||
}
|
||||
"Close" => "Fermer",
|
||||
"Slide preview" => "Aperçu de la diapositive",
|
||||
"Preview only — presentation unchanged" => "Aperçu uniquement — présentation inchangée",
|
||||
"Browser screen" => "Écran du navigateur",
|
||||
"Preview size" => "Taille des aperçus",
|
||||
"Change on click" => "Diffuser au clic",
|
||||
|
|
|
|||
|
|
@ -622,7 +622,9 @@ impl App {
|
|||
if !s.jump.is_empty() {
|
||||
s.jump.clear();
|
||||
} else if role == Role::Browser {
|
||||
s.execute(Action::CloseBrowser);
|
||||
if s.browser_preview.take().is_none() {
|
||||
s.execute(Action::CloseBrowser);
|
||||
}
|
||||
} else if s.layout_open || s.displays_open || s.menu_open {
|
||||
s.layout_open = false;
|
||||
s.displays_open = false;
|
||||
|
|
|
|||
|
|
@ -895,6 +895,12 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
|
|||
let locale = ui.ctx().clone();
|
||||
ui.painter()
|
||||
.rect_filled(ui.max_rect(), 0., ui.visuals().panel_fill);
|
||||
if s.change_on_click
|
||||
|| s.browser_preview
|
||||
.is_some_and(|(generation, page)| generation != s.generation || page >= s.count())
|
||||
{
|
||||
s.browser_preview = None;
|
||||
}
|
||||
native.trim(s);
|
||||
if s.count() == 0 {
|
||||
ui.label(tr(
|
||||
|
|
@ -1028,6 +1034,9 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
|
|||
egui::StrokeKind::Inside,
|
||||
);
|
||||
}
|
||||
if response.double_clicked() && !s.change_on_click {
|
||||
s.browser_preview = Some((s.generation, page));
|
||||
}
|
||||
if response.clicked() {
|
||||
s.browser_selected = page;
|
||||
if s.change_on_click {
|
||||
|
|
@ -1048,6 +1057,32 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) {
|
|||
});
|
||||
}
|
||||
});
|
||||
if let Some((_, page)) = s.browser_preview {
|
||||
// Keep preview requests in the browser's bounded asynchronous loading path.
|
||||
s.visible_thumbs.insert(page);
|
||||
let mut open = true;
|
||||
let screen = ui.ctx().content_rect().size();
|
||||
egui::Window::new(format!(
|
||||
"{} · {} / {}",
|
||||
tr(&locale, "Slide preview"),
|
||||
page + 1,
|
||||
s.count()
|
||||
))
|
||||
.id(egui::Id::new("slide-preview"))
|
||||
.open(&mut open)
|
||||
.collapsible(false)
|
||||
.resizable(true)
|
||||
.default_size(Vec2::new(800., 500.).min(screen * 0.8))
|
||||
.show(ui.ctx(), |ui| {
|
||||
ui.label(tr(&locale, "Preview only — presentation unchanged"));
|
||||
let (rect, _) =
|
||||
ui.allocate_exact_size(ui.available_size().max(Vec2::splat(1.)), Sense::hover());
|
||||
native.image(ui, s, page, rect);
|
||||
});
|
||||
if !open {
|
||||
s.browser_preview = None;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn menu(ui: &mut Ui, s: &mut Studio) {
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ pub struct Studio {
|
|||
pub menu_open: bool,
|
||||
pub browser_open: bool,
|
||||
pub browser_selected: usize,
|
||||
pub browser_preview: Option<(u64, usize)>,
|
||||
pub change_on_click: bool,
|
||||
pub jump: String,
|
||||
pub started: Instant,
|
||||
|
|
@ -169,6 +170,7 @@ impl Studio {
|
|||
menu_open: false,
|
||||
browser_open: false,
|
||||
browser_selected: 0,
|
||||
browser_preview: None,
|
||||
change_on_click: false,
|
||||
jump: String::new(),
|
||||
started: Instant::now(),
|
||||
|
|
@ -422,6 +424,7 @@ impl Studio {
|
|||
}
|
||||
Action::CloseBrowser => {
|
||||
self.browser_open = false;
|
||||
self.browser_preview = None;
|
||||
self.pending_save = true;
|
||||
}
|
||||
Action::Refresh => self.dirty_routes = true,
|
||||
|
|
|
|||
|
|
@ -657,3 +657,69 @@ fn end_of_slides_is_only_a_presenter_next_preview_not_a_page() {
|
|||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn browser_double_click_previews_without_live_navigation() {
|
||||
fn find(shape: &egui::Shape) -> Option<Pos2> {
|
||||
match shape {
|
||||
egui::Shape::Text(t) if t.galley.text() == "2" => Some(t.pos + Vec2::new(40., -45.)),
|
||||
egui::Shape::Vec(shapes) => shapes.iter().find_map(find),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
for live in [false, true] {
|
||||
let ctx = Context::default();
|
||||
let mut s = studio();
|
||||
s.change_on_click = live;
|
||||
s.browser_open = true;
|
||||
let mut native = UiState::default();
|
||||
let mut time = 0.;
|
||||
let mut frame = |s: &mut Studio, events| {
|
||||
time += 0.03;
|
||||
let mut raw = input(Vec2::new(1280., 900.));
|
||||
raw.time = Some(time);
|
||||
raw.events = events;
|
||||
ctx.run_ui(raw, |ui| presenter_ui::browser(ui, s, &mut native))
|
||||
};
|
||||
let mut output = frame(&mut s, vec![]);
|
||||
for _ in 0..3 {
|
||||
output = frame(&mut s, vec![]);
|
||||
}
|
||||
let pos = output.shapes.iter().find_map(|s| find(&s.shape)).unwrap();
|
||||
for _ in 0..2 {
|
||||
for pressed in [true, false] {
|
||||
frame(
|
||||
&mut s,
|
||||
vec![
|
||||
egui::Event::PointerMoved(pos),
|
||||
egui::Event::PointerButton {
|
||||
pos,
|
||||
button: egui::PointerButton::Primary,
|
||||
pressed,
|
||||
modifiers: Default::default(),
|
||||
},
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
assert_eq!(s.browser_selected, 1);
|
||||
assert_eq!(s.requested, 0);
|
||||
if live {
|
||||
assert!(s.browser_preview.is_none());
|
||||
assert!(s.actions.iter().any(|a| matches!(a, Action::Go(1))));
|
||||
} else {
|
||||
assert_eq!(s.browser_preview, Some((s.generation, 1)));
|
||||
assert!(s.actions.is_empty());
|
||||
s.generation += 1;
|
||||
frame(&mut s, vec![]);
|
||||
assert!(s.browser_preview.is_none());
|
||||
s.browser_preview = Some((s.generation, 1));
|
||||
s.change_on_click = true;
|
||||
frame(&mut s, vec![]);
|
||||
assert!(s.browser_preview.is_none());
|
||||
s.browser_preview = Some((s.generation, 1));
|
||||
s.execute(Action::CloseBrowser);
|
||||
assert!(s.browser_preview.is_none());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
### 0.1.37
|
||||
|
||||
- Double-click a thumbnail in All slides to open a resizable preview without
|
||||
changing output. Change on click mode retains live navigation without previews.
|
||||
Escape dismisses the preview first; changing documents clears stale previews.
|
||||
|
||||
### 0.1.36
|
||||
|
||||
- Give All slides a padded toolbar with separate title, preview/display settings,
|
||||
|
|
|
|||
|
|
@ -260,3 +260,7 @@ window-rule {
|
|||
|
||||
See [Niri window rules](https://github.com/niri-wm/niri/wiki/Configuration%3A-Window-Rules).
|
||||
The rule targets only All slides, not presenter or audience windows.
|
||||
|
||||
In All slides, double-click a thumbnail to open a larger, resizable preview inside
|
||||
the browser. It does not change the presentation. Close it with its X or Escape.
|
||||
When Change on click is enabled, clicks switch the live slide and do not open previews.
|
||||
|
|
|
|||
Loading…
Reference in New Issue