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

Release v0.2.15

Browse source
This commit is contained in:
burnintuna 2026-08-21 22:06:04 +09:00
parent 063770749e
commit 9aac91ccb1
5 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/viewer.rs
View file

@ -286,7 +286,11 @@ impl ViewerWindow {
} = controls;
let direction_control = two_page_direction_control
.expect("archive viewer requires a two-page direction control");
let title = source.display_name.clone();
let title_files = sibling_navigator
.as_ref()
.map(SiblingNavigator::files)
.unwrap_or_default();
let title = viewer_file_title(&source.display_name, &source.source_uri, &title_files);
let file_list_query = reuse_window
.as_ref()
.map(viewer_file_search_query)
@ -2260,7 +2264,11 @@ impl MediaViewerWindow {
view_mode_control,
two_page_direction_control: _,
} = controls;
let title = source.display_name.clone();
let title_files = sibling_navigator
.as_ref()
.map(SiblingNavigator::files)
.unwrap_or_default();
let title = viewer_file_title(&source.display_name, &source.source_uri, &title_files);
let file_list_query = reuse_window
.as_ref()
.map(viewer_file_search_query)
@ -2341,7 +2349,7 @@ impl MediaViewerWindow {
});
stack.add_named(&video, Some("video"));
let status_label = gtk::Label::builder()
.label(&title)
.label(&source.display_name)
.xalign(0.0)
.margin_top(6)
.margin_bottom(6)
@ -3425,6 +3433,13 @@ fn viewer_title_label(title: &str) -> gtk::Label {
.build()
}
fn viewer_file_title(display_name: &str, current_uri: &str, files: &[SiblingFile]) -> String {
seek_position(files, current_uri).map_or_else(
|| display_name.to_owned(),
|index| format!("{display_name} ({}/{})", index + 1, files.len()),
)
}
struct ViewerFileList {
panel: gtk::Box,
search: gtk::SearchEntry,
@ -4292,6 +4307,28 @@ mod tests {
assert_eq!(seek_sibling_files(files, EntryKind::Image, true).len(), 3);
}
#[test]
fn viewer_title_includes_current_file_index() {
let files = ["first.zip", "second.jpg", "third.mp4"].map(|name| SiblingFile {
uri: format!("file:///{name}"),
name: name.into(),
kind: EntryKind::Image,
});
assert_eq!(
viewer_file_title("second.jpg", "file:///second.jpg", &files),
"second.jpg (2/3)"
);
assert_eq!(
viewer_file_title("missing.jpg", "file:///missing.jpg", &files),
"missing.jpg"
);
assert_eq!(
viewer_file_title("only.jpg", "file:///only.jpg", &[]),
"only.jpg"
);
}
#[test]
fn playlist_search_filters_and_empty_query_restores_files() {
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {