Skip to content

Set search entry icon and styleclass according to results #1285

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

Merged
danirabbit merged 11 commits into from
Mar 28, 2023
Merged

Set search entry icon and styleclass according to results #1285

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b5d137c
Update appearance of search entry according to results label
Mar 16, 2023
fb5f0d0
Remove duplicate code
Mar 16, 2023
a396f14
Set primary icon sensitivity and tooltip according to results
Mar 16, 2023
d0afb1f
Merge branch 'master' into search-entry-classes
Mar 19, 2023
7a6806d
Merge branch 'master' into search-entry-classes
Mar 25, 2023
7e9f31d
Drop warning state
Mar 26, 2023
f838d13
Merge branch 'master' into search-entry-classes
danirabbit Mar 27, 2023
fcf7d5c
Merge branch 'master' into search-entry-classes
Mar 28, 2023
141b88a
Remove primary icon tooltip and action
Mar 28, 2023
c512005
Merge branch 'master' into search-entry-classes
Mar 28, 2023
b189ed5
Merge branch 'master' into search-entry-classes
danirabbit Mar 28, 2023
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
39 changes: 17 additions & 22 deletions src/Widgets/SearchBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ namespace Scratch.Widgets {
}

construct {
search_entry = new Gtk.SearchEntry ();
search_entry.hexpand = true;
search_entry.placeholder_text = _("Find");
search_entry = new Gtk.SearchEntry () {
hexpand = true,
placeholder_text = _("Find")
};

search_occurence_count_label = new Gtk.Label (_("No Results"));
search_occurence_count_label.get_style_context ().add_class (Granite.STYLE_CLASS_SMALL_LABEL);
Expand Down Expand Up @@ -328,23 +329,8 @@ namespace Scratch.Widgets {
return false;
}

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

bool found = search_context.forward (iter, out start_iter, out end_iter, null);
if (found) {
search_entry.get_style_context ().remove_class (Gtk.STYLE_CLASS_ERROR);
search_entry.primary_icon_name = "edit-find-symbolic";
return true;
} else {
if (search_entry.text != "") {
search_entry.get_style_context ().add_class (Gtk.STYLE_CLASS_ERROR);
search_entry.primary_icon_name = "dialog-error-symbolic";
}

return false;
}
update_search_widgets ();
return false;
}

public bool search () {
Expand All @@ -356,7 +342,6 @@ namespace Scratch.Widgets {

if (!has_matches ()) {
debug ("Can't search anything in a non-existent buffer and/or without anything to search.");
search_entry.primary_icon_name = "edit-find-symbolic";
return false;
}

Expand Down Expand Up @@ -595,7 +580,6 @@ namespace Scratch.Widgets {
tool_arrow_down.sensitive = true;
tool_arrow_up.sensitive =true;
} else {
// Gtk.TextIter? start_iter, end_iter;
Gtk.TextIter? tmp_start_iter, tmp_end_iter;

bool is_in_start, is_in_end;
Expand Down Expand Up @@ -626,6 +610,17 @@ namespace Scratch.Widgets {
}
}

// Update appearance of search entry
var ctx = search_entry.get_style_context ();

if (search_entry.text != "" && count_of_search == 0) {
ctx.add_class (Gtk.STYLE_CLASS_ERROR);
search_entry.primary_icon_name = "dialog-error-symbolic";
} else if (ctx.has_class (Gtk.STYLE_CLASS_ERROR)) {
ctx.remove_class (Gtk.STYLE_CLASS_ERROR);
search_entry.primary_icon_name = "edit-find-symbolic";
}

return Source.REMOVE;
});

Expand Down