godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82365 from YuriSizov/editor-colormatch-pressed-buttons

Browse Source 
Color match editor log toggles and flat pressed buttons
This commit is contained in:
Rémi Verschelde 2023-09-26 17:52:59 +02:00
commit f0d86f3767
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_log.cpp
View File

@ -442,6 +442,9 @@ EditorLog::EditorLog() {
copy_button->connect("pressed", callable_mp(this, &EditorLog::_copy_request)); copy_button->connect("pressed", callable_mp(this, &EditorLog::_copy_request));
hb_tools->add_child(copy_button); hb_tools->add_child(copy_button);
// Separate toggle buttons from normal buttons.
vb_right->add_child(memnew(HSeparator));
// A second hbox to make a 2x2 grid of buttons. // A second hbox to make a 2x2 grid of buttons.
HBoxContainer *hb_tools2 = memnew(HBoxContainer); HBoxContainer *hb_tools2 = memnew(HBoxContainer);
hb_tools2->set_h_size_flags(SIZE_SHRINK_CENTER); hb_tools2->set_h_size_flags(SIZE_SHRINK_CENTER);

7
editor/editor_themes.cpp
View File

@ -1030,9 +1030,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
} }
Ref<StyleBoxFlat> style_flat_button_pressed = style_widget_pressed->duplicate(); Ref<StyleBoxFlat> style_flat_button_pressed = style_widget_pressed->duplicate();
Color flat_pressed_color = dark_color_1.lerp(accent_color, 0.2) * Color(0.8, 0.8, 0.8, 0.85); Color flat_pressed_color = dark_color_1.lightened(0.24).lerp(accent_color, 0.2) * Color(0.8, 0.8, 0.8, 0.85);
if (dark_theme) { if (dark_theme) {
flat_pressed_color = dark_color_1.lerp(accent_color, 0.2) * Color(0.6, 0.6, 0.6, 0.85); flat_pressed_color = dark_color_1.lerp(accent_color, 0.12) * Color(0.6, 0.6, 0.6, 0.85);
} }
style_flat_button_pressed->set_bg_color(flat_pressed_color); style_flat_button_pressed->set_bg_color(flat_pressed_color);
@ -1074,7 +1074,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("icon_normal_color", "EditorLogFilterButton", icon_disabled_color); theme->set_color("icon_normal_color", "EditorLogFilterButton", icon_disabled_color);
// When pressed, add a small bottom border to the buttons to better show their active state, // When pressed, add a small bottom border to the buttons to better show their active state,
// similar to active tabs. // similar to active tabs.
Ref<StyleBoxFlat> editor_log_button_pressed = style_widget_pressed->duplicate();
Ref<StyleBoxFlat> editor_log_button_pressed = style_flat_button_pressed->duplicate();
editor_log_button_pressed->set_border_width(SIDE_BOTTOM, 2 * EDSCALE); editor_log_button_pressed->set_border_width(SIDE_BOTTOM, 2 * EDSCALE);
editor_log_button_pressed->set_border_color(accent_color); editor_log_button_pressed->set_border_color(accent_color);
theme->set_stylebox("pressed", "EditorLogFilterButton", editor_log_button_pressed); theme->set_stylebox("pressed", "EditorLogFilterButton", editor_log_button_pressed);