Skip to content

Simply search function #1803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jeremypw wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Simply search function #1803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions src/Widgets/SearchBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ namespace Scratch.Widgets {
this.text_buffer = text_view.get_buffer ();
this.text_buffer.changed.connect (on_text_buffer_changed);
this.search_context = new Gtk.SourceSearchContext (text_buffer as Gtk.SourceBuffer, null);
search_context.highlight = true; // There are no circumstances where we do not highlight
search_context.settings.wrap_around = cycle_search_button.active;
search_context.settings.regex_enabled = regex_search_button.active;
search_context.settings.search_text = search_entry.text;
Expand Down Expand Up @@ -385,19 +386,10 @@ namespace Scratch.Widgets {

public bool search () {
search_entry.grab_focus ();
if (search_context == null) {
return false;
}

search_context.highlight = false;

if (!has_matches ()) {
debug ("Can't search anything in a non-existent buffer and/or without anything to search.");
if (search_context == null || text_buffer == null || search_entry.text == "") {
return false;
}

search_context.highlight = true;

Gtk.TextIter? start_iter, end_iter;
text_buffer.get_iter_at_offset (out start_iter, text_buffer.cursor_position);

Expand All @@ -422,23 +414,6 @@ namespace Scratch.Widgets {
return true;
}

public void highlight_none () {
if (search_context != null) {
search_context.highlight = false;
}
}

private bool has_matches () {
if (text_buffer == null || search_entry.text == "") {
return false;
}

bool has_wrapped_around;
Gtk.TextIter? start_iter, end_iter;
text_buffer.get_start_iter (out start_iter);
return search_context.forward (start_iter, out start_iter, out end_iter, out has_wrapped_around);
}

private bool search_for_iter (Gtk.TextIter? start_iter, out Gtk.TextIter? end_iter) {
end_iter = start_iter;

Expand Down