ardour/livetrax
13
0
Fork 0
Code

remove preference highlighting on focus out

Browse Source
This commit is contained in:
Paul Davis 2023-01-23 09:13:09 -07:00
parent 5ec0665457
commit 0923d898d2
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk2_ardour/option_editor.cc
View File

@ -800,6 +800,7 @@ OptionEditor::OptionEditor (PBD::Configuration* c)
: _config (c) : _config (c)
, option_tree (TreeStore::create (option_columns)) , option_tree (TreeStore::create (option_columns))
, search_results (0) , search_results (0)
, search_current_highlight (0)
, search_not_found_count (0) , search_not_found_count (0)
, option_treeview (option_tree) , option_treeview (option_tree)
{ {
@ -857,6 +858,11 @@ OptionEditor::search_key_focus (GdkEventFocus* ev)
search_entry.set_text (_("Search here...")); search_entry.set_text (_("Search here..."));
search_entry.set_name (X_("ShadedEntry")); search_entry.set_name (X_("ShadedEntry"));
} }
if (search_current_highlight) {
search_current_highlight->end_highlight ();
search_current_highlight = 0;
}
} }
return false; return false;
} }
@ -868,6 +874,16 @@ OptionEditor::search_key_press (GdkEventKey* ev)
search_entry.set_text (""); search_entry.set_text ("");
search_entry.set_name (X_("GtkEntry")); search_entry.set_name (X_("GtkEntry"));
} }
/* any key press should remove the current highlight, since something
* is changing.
*/
if (search_current_highlight) {
search_current_highlight->end_highlight ();
search_current_highlight = 0;
}
return false; return false;
} }
@ -915,8 +931,12 @@ OptionEditor::search ()
* the next if we can. * the next if we can.
*/ */
if (search_current_highlight) {
search_current_highlight->end_highlight ();
search_current_highlight = 0;
}
if (search_iterator != search_results->end()) { if (search_iterator != search_results->end()) {
search_iterator->component.end_highlight ();
++search_iterator; ++search_iterator;
} }
@ -958,7 +978,8 @@ OptionEditor::search_highlight (std::string const & page_title, OptionEditorComp
if (current_page() != page_title) { if (current_page() != page_title) {
set_current_page (page_title); set_current_page (page_title);
} }
component.highlight (); search_current_highlight = &component;
search_current_highlight->highlight ();
} }

1
gtk2_ardour/option_editor.h
View File

@ -759,6 +759,7 @@ protected:
typedef std::vector<SearchResult> SearchResults; typedef std::vector<SearchResult> SearchResults;
SearchResults* search_results; SearchResults* search_results;
SearchResults::iterator search_iterator; SearchResults::iterator search_iterator;
OptionEditorComponent* search_current_highlight;
std::string last_search_string; std::string last_search_string;
int search_not_found_count; int search_not_found_count;
sigc::connection not_found_timeout; sigc::connection not_found_timeout;