asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes and improvements to Search Results dock

Browse source
This commit is contained in:
VolTer 2022-09-29 03:21:48 +02:00
parent 0a0e99cadc
commit 1fa329b0e4
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
editor/find_in_files.cpp
View file

@ -607,6 +607,7 @@ FindInFilesPanel::FindInFilesPanel() {
_results_display->set_hide_root(true); _results_display->set_hide_root(true);
_results_display->set_select_mode(Tree::SELECT_ROW); _results_display->set_select_mode(Tree::SELECT_ROW);
_results_display->set_allow_rmb_select(true); _results_display->set_allow_rmb_select(true);
_results_display->set_allow_reselect(true);
_results_display->create_item(); // Root _results_display->create_item(); // Root
vbc->add_child(_results_display); vbc->add_child(_results_display);
@ -718,6 +719,10 @@ void FindInFilesPanel::_on_result_found(String fpath, int line_number, int begin
file_item = E->value; file_item = E->value;
} }
Color file_item_color = _results_display->get_theme_color(SNAME("font_color")) * Color(1, 1, 1, 0.67);
file_item->set_custom_color(0, file_item_color);
file_item->set_selectable(0, false);
int text_index = _with_replace ? 1 : 0; int text_index = _with_replace ? 1 : 0;
TreeItem *item = _results_display->create_item(file_item); TreeItem *item = _results_display->create_item(file_item);
@ -764,13 +769,13 @@ void FindInFilesPanel::draw_result_text(Object *item_obj, Rect2 rect) {
int font_size = _results_display->get_theme_font_size(SNAME("font_size")); int font_size = _results_display->get_theme_font_size(SNAME("font_size"));
Rect2 match_rect = rect; Rect2 match_rect = rect;
match_rect.position.x += font->get_string_size(item_text.left(r.begin_trimmed), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).x; match_rect.position.x += font->get_string_size(item_text.left(r.begin_trimmed), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).x - 1;
match_rect.size.x = font->get_string_size(_search_text_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).x; match_rect.size.x = font->get_string_size(_search_text_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).x + 2;
match_rect.position.y += 1 * EDSCALE; match_rect.position.y += 1 * EDSCALE;
match_rect.size.y -= 2 * EDSCALE; match_rect.size.y -= 2 * EDSCALE;
// Use the inverted accent color to help match rectangles stand out even on the currently selected line. _results_display->draw_rect(match_rect, get_theme_color(SNAME("accent_color"), SNAME("Editor")) * Color(1, 1, 1, 0.33), false, 2.0);
_results_display->draw_rect(match_rect, get_theme_color(SNAME("accent_color"), SNAME("Editor")).inverted() * Color(1, 1, 1, 0.5)); _results_display->draw_rect(match_rect, get_theme_color(SNAME("accent_color"), SNAME("Editor")) * Color(1, 1, 1, 0.17), true);
// Text is drawn by Tree already. // Text is drawn by Tree already.
} }
@ -778,14 +783,12 @@ void FindInFilesPanel::draw_result_text(Object *item_obj, Rect2 rect) {
void FindInFilesPanel::_on_item_edited() { void FindInFilesPanel::_on_item_edited() {
TreeItem *item = _results_display->get_selected(); TreeItem *item = _results_display->get_selected();
if (item->is_checked(0)) { // Change opacity to half if checkbox is checked, otherwise full.
item->set_custom_color(1, _results_display->get_theme_color(SNAME("font_color"))); Color use_color = _results_display->get_theme_color(SNAME("font_color"));
} else { if (!item->is_checked(0)) {
// Grey out. use_color.a *= 0.5;
Color color = _results_display->get_theme_color(SNAME("font_color"));
color.a /= 2.0;
item->set_custom_color(1, color);
} }
item->set_custom_color(1, use_color);
} }
void FindInFilesPanel::_on_finished() { void FindInFilesPanel::_on_finished() {
@ -794,11 +797,11 @@ void FindInFilesPanel::_on_finished() {
int file_count = _file_items.size(); int file_count = _file_items.size();
if (result_count == 1 && file_count == 1) { if (result_count == 1 && file_count == 1) {
results_text = vformat(TTR("%d match in %d file."), result_count, file_count); results_text = vformat(TTR("%d match in %d file"), result_count, file_count);
} else if (result_count != 1 && file_count == 1) { } else if (result_count != 1 && file_count == 1) {
results_text = vformat(TTR("%d matches in %d file."), result_count, file_count); results_text = vformat(TTR("%d matches in %d file"), result_count, file_count);
} else { } else {
results_text = vformat(TTR("%d matches in %d files."), result_count, file_count); results_text = vformat(TTR("%d matches in %d files"), result_count, file_count);
} }
_status_label->set_text(results_text); _status_label->set_text(results_text);