burningtuna/Comicviewer
1
0
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

Release v0.2.13

Browse source
This commit is contained in:
burnintuna 2026-08-21 21:29:25 +09:00
parent 195bd2554f
commit 605248a969
6 changed files with 156 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

189
src/viewer.rs
View file

@ -23,6 +23,7 @@ const VIDEO_VOLUME_STEP: f64 = 0.05;
const IMAGE_ZOOM_STEP: f64 = 0.1;
const IMAGE_ZOOM_MIN: f64 = 0.1;
const IMAGE_ZOOM_MAX: f64 = 4.0;
const IMAGE_PAN_STEP: f64 = 100.0;
const VIEWER_CONTROLLER_KEY: &str = "comicviewer-viewer-controller";
const MEDIA_VIEWER_CONTROLLER_KEY: &str = "comicviewer-media-viewer-controller";
const VIEWER_FILE_SEARCH_KEY: &str = "comicviewer-file-search";
@ -974,22 +975,16 @@ impl ViewerController {
controller.seek_edge(true);
glib::Propagation::Stop
}
gdk::Key::Up | gdk::Key::KP_Up
if matches!(
controller.view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous
) =>
{
controller.scroll_vertically(false);
gdk::Key::Up | gdk::Key::KP_Up if controller.pan_image(false, false) => {
glib::Propagation::Stop
}
gdk::Key::Down | gdk::Key::KP_Down
if matches!(
controller.view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous
) =>
{
controller.scroll_vertically(true);
gdk::Key::Down | gdk::Key::KP_Down if controller.pan_image(false, true) => {
glib::Propagation::Stop
}
gdk::Key::Left | gdk::Key::KP_Left if controller.pan_image(true, false) => {
glib::Propagation::Stop
}
gdk::Key::Right | gdk::Key::KP_Right if controller.pan_image(true, true) => {
glib::Propagation::Stop
}
gdk::Key::Left | gdk::Key::KP_Left | gdk::Key::Page_Up => {
@ -1016,6 +1011,22 @@ impl ViewerController {
controller.adjust_image_zoom(false);
glib::Propagation::Stop
}
gdk::Key::_1 | gdk::Key::KP_1 => {
controller.select_view_mode(1);
glib::Propagation::Stop
}
gdk::Key::_2 | gdk::Key::KP_2 => {
controller.select_view_mode(2);
glib::Propagation::Stop
}
gdk::Key::_3 | gdk::Key::KP_3 => {
controller.select_view_mode(3);
glib::Propagation::Stop
}
gdk::Key::_4 | gdk::Key::KP_4 => {
controller.select_view_mode(0);
glib::Propagation::Stop
}
_ if !shortcut_modifiers_blocked(modifiers)
&& key
.to_unicode()
@ -1548,6 +1559,15 @@ impl ViewerController {
self.stack.queue_allocate();
}
fn select_view_mode(self: &Rc<Self>, index: u32) {
if self.mode_dropdown.selected() != index {
self.mode_dropdown.set_selected(index);
} else {
self.image_zoom.set(1.0);
self.apply_view_mode();
}
}
fn schedule_view_mode_refresh(self: &Rc<Self>) {
let generation = self.view_layout_generation.get().wrapping_add(1);
self.view_layout_generation.set(generation);
@ -1615,16 +1635,18 @@ impl ViewerController {
self.seek_page(if end { count - 1 } else { 0 });
}
fn scroll_vertically(&self, down: bool) {
let adjustment = if self.view_mode() == ViewMode::Continuous {
self.continuous_scrolled.vadjustment()
} else {
self.single_scrolled.vadjustment()
fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
let scrolled = match self.view_mode() {
ViewMode::TwoPage => &self.spread_scrolled,
ViewMode::Continuous => &self.continuous_scrolled,
_ => &self.single_scrolled,
};
let step = adjustment.step_increment().max(64.0);
let delta = if down { step } else { -step };
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower());
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum));
let adjustment = if horizontal {
scrolled.hadjustment()
} else {
scrolled.vadjustment()
};
pan_adjustment(&adjustment, forward)
}
fn shift_pairing(self: &Rc<Self>, offset: isize) {
@ -2306,11 +2328,17 @@ impl MediaViewerWindow {
} else {
gtk::Video::new()
};
video.set_autoplay(true);
video.set_autoplay(false);
video.set_hexpand(true);
video.set_vexpand(true);
let video_for_loop = video.clone();
loop_check.connect_toggled(move |check| video_for_loop.set_loop(check.is_active()));
loop_check.connect_toggled(move |check| {
let active = check.is_active();
video_for_loop.set_loop(active);
if let Some(stream) = video_for_loop.media_stream() {
stream.set_loop(active);
}
});
stack.add_named(&video, Some("video"));
let status_label = gtk::Label::builder()
.label(&title)
@ -2431,6 +2459,7 @@ impl MediaViewerWindow {
EntryKind::Video => {
controller.stack.set_visible_child_name("video");
if let Some(stream) = controller.video.media_stream() {
initialize_video_volume(&stream);
stream.play();
}
}
@ -2580,22 +2609,23 @@ impl MediaViewerController {
}
gdk::Key::Up | gdk::Key::KP_Up
if controller.kind == EntryKind::Image
&& matches!(
controller.image_view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth
) =>
&& controller.pan_image(false, false) =>
{
controller.scroll_image(false);
glib::Propagation::Stop
}
gdk::Key::Down | gdk::Key::KP_Down
if controller.kind == EntryKind::Image
&& matches!(
controller.image_view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth
) =>
if controller.kind == EntryKind::Image && controller.pan_image(false, true) =>
{
glib::Propagation::Stop
}
gdk::Key::Left | gdk::Key::KP_Left
if controller.kind == EntryKind::Image && controller.pan_image(true, false) =>
{
glib::Propagation::Stop
}
gdk::Key::Right | gdk::Key::KP_Right
if controller.kind == EntryKind::Image && controller.pan_image(true, true) =>
{
controller.scroll_image(true);
glib::Propagation::Stop
}
_ if key.to_unicode() == Some('[') => {
@ -2614,6 +2644,18 @@ impl MediaViewerController {
controller.adjust_image_zoom(false);
glib::Propagation::Stop
}
gdk::Key::_1 | gdk::Key::KP_1 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(1);
glib::Propagation::Stop
}
gdk::Key::_2 | gdk::Key::KP_2 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(2);
glib::Propagation::Stop
}
gdk::Key::_4 | gdk::Key::KP_4 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(0);
glib::Propagation::Stop
}
_ if key
.to_unicode()
.is_some_and(|character| character.eq_ignore_ascii_case(&'l')) =>
@ -2982,6 +3024,15 @@ impl MediaViewerController {
}
}
fn select_image_view_mode(&self, index: u32) {
if self.image_mode_dropdown.selected() != index {
self.image_mode_dropdown.set_selected(index);
} else {
self.image_zoom.set(1.0);
self.apply_image_view_mode();
}
}
fn resize_image_picture(&self) {
let Some((texture_width, texture_height)) = self.image_dimensions.get() else {
return;
@ -3017,12 +3068,13 @@ impl MediaViewerController {
}
}
fn scroll_image(&self, down: bool) {
let adjustment = self.image_scrolled.vadjustment();
let step = adjustment.step_increment().max(64.0);
let delta = if down { step } else { -step };
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower());
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum));
fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
let adjustment = if horizontal {
self.image_scrolled.hadjustment()
} else {
self.image_scrolled.vadjustment()
};
pan_adjustment(&adjustment, forward)
}
fn open_sibling(&self, forward: bool) {
@ -3995,6 +4047,46 @@ fn video_volume_target(volume: f64, delta: f64) -> f64 {
(volume + delta).clamp(0.0, 1.0)
}
fn initialize_video_volume(stream: &gtk::MediaStream) {
let volume = stream.volume().clamp(0.0, 1.0);
// Force the realized playback backend and GTK controls to receive the same initial value.
stream.set_volume(if volume > 0.0 { 0.0 } else { 1.0 });
stream.set_volume(volume);
}
fn pan_adjustment(adjustment: &gtk::Adjustment, forward: bool) -> bool {
let Some(value) = image_pan_target(
adjustment.value(),
adjustment.lower(),
adjustment.upper(),
adjustment.page_size(),
forward,
) else {
return false;
};
adjustment.set_value(value);
true
}
fn image_pan_target(
value: f64,
lower: f64,
upper: f64,
page_size: f64,
forward: bool,
) -> Option<f64> {
let maximum = (upper - page_size).max(lower);
if maximum <= lower {
return None;
}
let delta = if forward {
IMAGE_PAN_STEP
} else {
-IMAGE_PAN_STEP
};
Some((value + delta).clamp(lower, maximum))
}
#[cfg(test)]
mod tests {
use super::*;
@ -4111,6 +4203,19 @@ mod tests {
assert_eq!(video_volume_target(0.5, 0.05), 0.55);
}
#[test]
fn image_pan_moves_at_most_100_pixels_and_consumes_clipped_axis() {
assert_eq!(
image_pan_target(250.0, 0.0, 1_000.0, 400.0, true),
Some(350.0)
);
assert_eq!(
image_pan_target(600.0, 0.0, 1_000.0, 400.0, true),
Some(600.0)
);
assert_eq!(image_pan_target(0.0, 0.0, 400.0, 400.0, true), None);
}
#[test]
fn viewer_file_typeahead_wraps_by_display_name() {
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {