Skip to content

Commit

Permalink
Merge pull request #50646 from SirQuartz/3.x
Browse files Browse the repository at this point in the history
Fix Illegible text in audio bus editor 3.x
  • Loading branch information
akien-mga authored Jul 22, 2021
2 parents 214106d + d2cbf33 commit 2ac292a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions editor/editor_themes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {

const Color font_color = mono_color.linear_interpolate(base_color, 0.25);
const Color font_color_hl = mono_color.linear_interpolate(base_color, 0.15);
const Color font_color_hover = mono_color.linear_interpolate(base_color, 0.125);
const Color font_color_disabled = Color(mono_color.r, mono_color.g, mono_color.b, 0.3);
const Color font_color_selection = accent_color * Color(1, 1, 1, 0.4);
const Color color_disabled = mono_color.inverted().linear_interpolate(base_color, 0.7);
Expand Down Expand Up @@ -954,6 +955,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_stylebox("focus", "LineEdit", style_widget_focus);
theme->set_stylebox("read_only", "LineEdit", style_widget_disabled);
theme->set_icon("clear", "LineEdit", theme->get_icon("GuiClose", "EditorIcons"));
theme->set_color("font_color_uneditable", "LineEdit", font_color_disabled);
theme->set_color("read_only", "LineEdit", font_color_disabled);
theme->set_color("font_color", "LineEdit", font_color);
theme->set_color("font_color_selected", "LineEdit", mono_color);
Expand Down Expand Up @@ -1095,11 +1097,11 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_tooltip->set_default_margin(MARGIN_TOP, v);
style_tooltip->set_default_margin(MARGIN_RIGHT, v);
style_tooltip->set_default_margin(MARGIN_BOTTOM, v);
style_tooltip->set_bg_color(Color(mono_color.r, mono_color.g, mono_color.b, 0.9));
style_tooltip->set_bg_color(mono_color.inverted());
style_tooltip->set_border_width_all(border_width);
style_tooltip->set_border_color(mono_color);
theme->set_color("font_color", "TooltipLabel", font_color.inverted());
theme->set_color("font_color_shadow", "TooltipLabel", mono_color.inverted() * Color(1, 1, 1, 0.1));
style_tooltip->set_border_color(mono_color.inverted());
theme->set_color("font_color", "TooltipLabel", font_color_hover);
theme->set_color("font_color_shadow", "TooltipLabel", Color(0, 0, 0, 0));
theme->set_stylebox("panel", "TooltipPanel", style_tooltip);

// PopupPanel
Expand Down

0 comments on commit 2ac292a

Please sign in to comment.