YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-15 09:10:08 +00:00
Code Issues Projects Releases Wiki Activity

collect TextIter start matches as find result

Browse Source
This commit is contained in:
yggverse 2024-12-15 16:05:36 +02:00
parent 87d6f10170
commit 965a89ffc0
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/browser/window/tab/item/page/content/text/gemini/reader/widget/find.rs
View File

@ -1,8 +1,8 @@
use gtk::{ use gtk::{
gdk::{Cursor, RGBA}, gdk::{Cursor, RGBA},
prelude::{BoxExt, ButtonExt, CheckButtonExt, EditableExt, EntryExt, TextBufferExt, WidgetExt}, prelude::{BoxExt, ButtonExt, CheckButtonExt, EditableExt, EntryExt, TextBufferExt, WidgetExt},
Box, Button, CheckButton, Entry, EntryIconPosition, Orientation, TextBuffer, TextSearchFlags, Box, Button, CheckButton, Entry, EntryIconPosition, Orientation, TextBuffer, TextIter,
TextTag, TextSearchFlags, TextTag,
}; };
const MARGIN: i32 = 6; const MARGIN: i32 = 6;
@ -112,11 +112,11 @@ impl Find {
entry.text().as_str(), entry.text().as_str(),
match_case.is_active(), match_case.is_active(),
) )
.is_positive() .is_empty()
{ {
entry.remove_css_class("error");
} else {
entry.add_css_class("error"); entry.add_css_class("error");
} else {
entry.remove_css_class("error");
} }
} }
}); });
@ -137,11 +137,11 @@ impl Find {
entry.text().as_str(), entry.text().as_str(),
this.is_active(), this.is_active(),
) )
.is_positive() .is_empty()
{ {
entry.remove_css_class("error");
} else {
entry.add_css_class("error"); entry.add_css_class("error");
} else {
entry.remove_css_class("error");
} }
} }
}); });
@ -155,7 +155,15 @@ impl Find {
} }
} }
fn find(text_buffer: &TextBuffer, found_tag: &TextTag, subject: &str, is_match_case: bool) -> i64 { fn find(
text_buffer: &TextBuffer,
found_tag: &TextTag,
subject: &str,
is_match_case: bool,
) -> Vec<TextIter> {
// Init start matches result
let mut result = Vec::new();
// Cleanup previous search results // Cleanup previous search results
text_buffer.remove_tag( text_buffer.remove_tag(
found_tag, found_tag,
@ -165,7 +173,6 @@ fn find(text_buffer: &TextBuffer, found_tag: &TextTag, subject: &str, is_match_c
// Begin search // Begin search
let mut next = text_buffer.start_iter(); let mut next = text_buffer.start_iter();
let mut total: i64 = 0;
while let Some((start, end)) = next.forward_search( while let Some((start, end)) = next.forward_search(
subject, subject,
match is_match_case { match is_match_case {
@ -175,9 +182,8 @@ fn find(text_buffer: &TextBuffer, found_tag: &TextTag, subject: &str, is_match_c
None, // unlimited None, // unlimited
) { ) {
text_buffer.apply_tag(found_tag, &start, &end); text_buffer.apply_tag(found_tag, &start, &end);
total += 1; result.push(start);
next = end; next = end;
} }
result
total
} }