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

Release v0.2.8

Browse source
This commit is contained in:
burnintuna 2026-07-24 21:55:41 +09:00
parent f4a0c484ff
commit 6c54ec8139
9 changed files with 151 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

116
src/viewer.rs
View file

@ -25,6 +25,7 @@ const IMAGE_ZOOM_MIN: f64 = 0.1;
const IMAGE_ZOOM_MAX: f64 = 4.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";
const PRESERVE_SEEK_CLASS: &str = "viewer-preserve-seek";
fn clear_viewer_controller(window: &gtk::ApplicationWindow) {
@ -275,6 +276,10 @@ impl ViewerWindow {
view_mode_control: _,
} = controls;
let title = source.display_name.clone();
let file_list_query = reuse_window
.as_ref()
.map(viewer_file_search_query)
.unwrap_or_default();
if let Some(window) = reuse_window.as_ref() {
clear_viewer_controller(window);
}
@ -399,7 +404,7 @@ impl ViewerWindow {
window_overlay.add_overlay(&navigation_message);
window_overlay.set_hexpand(true);
window_overlay.set_vexpand(true);
let file_list = viewer_file_list();
let file_list = viewer_file_list(&file_list_query);
file_list.panel.set_visible(file_list_button.is_active());
let viewer_layout = gtk::Box::new(gtk::Orientation::Horizontal, 0);
viewer_layout.append(&window_overlay);
@ -438,6 +443,7 @@ impl ViewerWindow {
sibling_navigator,
file_list_button,
file_list_panel: file_list.panel,
file_list_search: file_list.search,
file_list: file_list.list,
file_list_files: RefCell::new(Vec::new()),
favorite_button,
@ -605,7 +611,8 @@ struct ViewerController {
case_insensitive_sort: bool,
sibling_navigator: Option<SiblingNavigator>,
file_list_button: gtk::ToggleButton,
file_list_panel: gtk::ScrolledWindow,
file_list_panel: gtk::Box,
file_list_search: gtk::SearchEntry,
file_list: gtk::ListBox,
file_list_files: RefCell<Vec<SiblingFile>>,
favorite_button: gtk::Button,
@ -717,6 +724,13 @@ impl ViewerController {
controller.open_file_list_row(row.index());
}
});
let controller = Rc::downgrade(self);
self.file_list_search.connect_search_changed(move |search| {
if let Some(controller) = controller.upgrade() {
store_viewer_file_search_query(&controller.window, search.text().as_str());
controller.refresh_file_list();
}
});
let file_list_typeahead = Rc::new(RefCell::new(TypeaheadBuffer::default()));
let file_list_keys = gtk::EventControllerKey::new();
let controller = Rc::downgrade(self);
@ -890,6 +904,7 @@ impl ViewerController {
let controller = Rc::downgrade(self);
fullscreen_keys.connect_key_pressed(move |_, key, _, _| {
if let Some(controller) = controller.upgrade()
&& !widget_contains_focus(&controller.file_list_search, &controller.window)
&& controller.window.is_fullscreen()
&& fullscreen_direction_key(key)
{
@ -907,6 +922,9 @@ impl ViewerController {
let Some(controller) = controller.upgrade() else {
return glib::Propagation::Proceed;
};
if widget_contains_focus(&controller.file_list_search, &controller.window) {
return glib::Propagation::Proceed;
}
if !controller.window.is_fullscreen() {
controller.hide_seek();
}
@ -1026,6 +1044,7 @@ impl ViewerController {
.as_ref()
.map(SiblingNavigator::files)
.unwrap_or_default();
let files = filter_sibling_files(files, self.file_list_search.text().as_str());
let current = files
.iter()
.position(|file| file.uri == self.source.source_uri);
@ -2167,6 +2186,10 @@ impl MediaViewerWindow {
view_mode_control,
} = controls;
let title = source.display_name.clone();
let file_list_query = reuse_window
.as_ref()
.map(viewer_file_search_query)
.unwrap_or_default();
if let Some(window) = reuse_window.as_ref() {
clear_viewer_controller(window);
}
@ -2263,7 +2286,7 @@ impl MediaViewerWindow {
window_overlay.add_overlay(&navigation_message);
window_overlay.set_hexpand(true);
window_overlay.set_vexpand(true);
let file_list = viewer_file_list();
let file_list = viewer_file_list(&file_list_query);
file_list.panel.set_visible(file_list_button.is_active());
let viewer_layout = gtk::Box::new(gtk::Orientation::Horizontal, 0);
viewer_layout.append(&window_overlay);
@ -2292,6 +2315,7 @@ impl MediaViewerWindow {
sibling_navigator,
file_list_button,
file_list_panel: file_list.panel,
file_list_search: file_list.search,
file_list: file_list.list,
file_list_files: RefCell::new(Vec::new()),
favorite_button,
@ -2377,7 +2401,8 @@ struct MediaViewerController {
seek_files: RefCell<Vec<SiblingFile>>,
sibling_navigator: Option<SiblingNavigator>,
file_list_button: gtk::ToggleButton,
file_list_panel: gtk::ScrolledWindow,
file_list_panel: gtk::Box,
file_list_search: gtk::SearchEntry,
file_list: gtk::ListBox,
file_list_files: RefCell<Vec<SiblingFile>>,
favorite_button: gtk::Button,
@ -2434,6 +2459,7 @@ impl MediaViewerController {
let controller = Rc::downgrade(self);
fullscreen_keys.connect_key_pressed(move |_, key, _, _| {
if let Some(controller) = controller.upgrade()
&& !widget_contains_focus(&controller.file_list_search, &controller.window)
&& controller.window.is_fullscreen()
&& fullscreen_direction_key(key)
{
@ -2451,6 +2477,9 @@ impl MediaViewerController {
let Some(controller) = controller.upgrade() else {
return glib::Propagation::Proceed;
};
if widget_contains_focus(&controller.file_list_search, &controller.window) {
return glib::Propagation::Proceed;
}
if modifiers.intersects(
gdk::ModifierType::CONTROL_MASK
| gdk::ModifierType::ALT_MASK
@ -2596,6 +2625,13 @@ impl MediaViewerController {
controller.open_file_list_row(row.index());
}
});
let controller = Rc::downgrade(self);
self.file_list_search.connect_search_changed(move |search| {
if let Some(controller) = controller.upgrade() {
store_viewer_file_search_query(&controller.window, search.text().as_str());
controller.refresh_file_list();
}
});
let file_list_typeahead = Rc::new(RefCell::new(TypeaheadBuffer::default()));
let file_list_keys = gtk::EventControllerKey::new();
let controller = Rc::downgrade(self);
@ -2716,6 +2752,7 @@ impl MediaViewerController {
.as_ref()
.map(SiblingNavigator::files)
.unwrap_or_default();
let files = filter_sibling_files(files, self.file_list_search.text().as_str());
let current = files
.iter()
.position(|file| file.uri == self.source.source_uri);
@ -3254,7 +3291,8 @@ fn favorite_label(active: bool) -> &'static str {
}
struct ViewerFileList {
panel: gtk::ScrolledWindow,
panel: gtk::Box,
search: gtk::SearchEntry,
list: gtk::ListBox,
}
@ -3361,18 +3399,56 @@ fn find_sibling_prefix(files: &[SiblingFile], query: &str, start: usize) -> Opti
.find(|index| files[*index].name.to_lowercase().starts_with(&query))
}
fn viewer_file_list() -> ViewerFileList {
fn viewer_file_list(query: &str) -> ViewerFileList {
let search = gtk::SearchEntry::builder()
.placeholder_text("재생 목록 검색")
.margin_top(8)
.margin_bottom(8)
.margin_start(8)
.margin_end(8)
.build();
search.set_text(query);
let list = gtk::ListBox::new();
list.set_selection_mode(gtk::SelectionMode::Single);
list.set_activate_on_single_click(false);
let panel = gtk::ScrolledWindow::builder()
.width_request(280)
let scrolled = gtk::ScrolledWindow::builder()
.vexpand(true)
.child(&list)
.build();
let panel = gtk::Box::new(gtk::Orientation::Vertical, 0);
panel.set_width_request(280);
panel.set_vexpand(true);
panel.append(&search);
panel.append(&scrolled);
panel.add_css_class("sidebar");
panel.set_visible(false);
ViewerFileList { panel, list }
ViewerFileList {
panel,
search,
list,
}
}
fn viewer_file_search_query(window: &gtk::ApplicationWindow) -> String {
unsafe {
window
.data::<String>(VIEWER_FILE_SEARCH_KEY)
.map(|query| query.as_ref().clone())
.unwrap_or_default()
}
}
fn store_viewer_file_search_query(window: &gtk::ApplicationWindow, query: &str) {
unsafe {
window.set_data(VIEWER_FILE_SEARCH_KEY, query.to_owned());
}
}
fn widget_contains_focus(widget: &impl IsA<gtk::Widget>, window: &gtk::ApplicationWindow) -> bool {
gtk::prelude::GtkWindowExt::focus(window).is_some_and(|focus| {
let widget = widget.as_ref();
focus == *widget || focus.is_ancestor(widget)
})
}
fn viewer_file_row(file: &SiblingFile) -> gtk::ListBoxRow {
@ -3774,6 +3850,14 @@ fn seek_sibling_files(
files
}
fn filter_sibling_files(mut files: Vec<SiblingFile>, query: &str) -> Vec<SiblingFile> {
let query = query.to_lowercase();
if !query.is_empty() {
files.retain(|file| file.name.to_lowercase().contains(&query));
}
files
}
fn seek_position(files: &[SiblingFile], current_uri: &str) -> Option<usize> {
files.iter().position(|file| file.uri == current_uri)
}
@ -3981,6 +4065,20 @@ mod tests {
assert_eq!(seek_sibling_files(files, EntryKind::Image, true).len(), 3);
}
#[test]
fn playlist_search_filters_and_empty_query_restores_files() {
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {
uri: format!("file:///{name}"),
name: name.into(),
kind: EntryKind::Image,
});
let filtered = filter_sibling_files(files.to_vec(), "BRAV");
assert_eq!(filtered.len(), 1);
assert_eq!(filtered[0].name, "Bravo.mp4");
assert_eq!(filter_sibling_files(files.to_vec(), "").len(), 3);
}
#[test]
fn file_list_shortcut_rejects_command_modifiers() {
assert!(!shortcut_modifiers_blocked(gdk::ModifierType::SHIFT_MASK));