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

Merge pull request #74196 from YeldhamDev/accent_backport 

Backport a simpler version of the accent color for check icons
This commit is contained in:
Rémi Verschelde 2023-03-06 12:37:41 +01:00
parent b810045a12 7173565250
commit e8c9b251ef
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_themes.cpp
View File

@ -219,8 +219,6 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
exceptions.insert("ProceduralSky"); exceptions.insert("ProceduralSky");
exceptions.insert("EditorControlAnchor"); exceptions.insert("EditorControlAnchor");
exceptions.insert("DefaultProjectIcon"); exceptions.insert("DefaultProjectIcon");
exceptions.insert("GuiChecked");
exceptions.insert("GuiRadioChecked");
exceptions.insert("GuiCloseCustomizable"); exceptions.insert("GuiCloseCustomizable");
exceptions.insert("GuiGraphNodePort"); exceptions.insert("GuiGraphNodePort");
exceptions.insert("GuiResizer"); exceptions.insert("GuiResizer");
@ -244,9 +242,11 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
} }
// These ones should be converted even if we are using a dark theme. // These ones should be converted even if we are using a dark theme.
const Color accent_color = EDITOR_GET("interface/theme/accent_color");
const Color error_color = p_theme->get_color("error_color", "Editor"); const Color error_color = p_theme->get_color("error_color", "Editor");
const Color success_color = p_theme->get_color("success_color", "Editor"); const Color success_color = p_theme->get_color("success_color", "Editor");
const Color warning_color = p_theme->get_color("warning_color", "Editor"); const Color warning_color = p_theme->get_color("warning_color", "Editor");
dark_icon_color_dictionary[Color::html("#699ce8")] = accent_color;
dark_icon_color_dictionary[Color::html("#ff0000")] = error_color; dark_icon_color_dictionary[Color::html("#ff0000")] = error_color;
dark_icon_color_dictionary[Color::html("#45ff8b")] = success_color; dark_icon_color_dictionary[Color::html("#45ff8b")] = success_color;
dark_icon_color_dictionary[Color::html("#dbab09")] = warning_color; dark_icon_color_dictionary[Color::html("#dbab09")] = warning_color;
@ -682,7 +682,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("icon_color_hover", "CheckButton", icon_color_hover); theme->set_color("icon_color_hover", "CheckButton", icon_color_hover);
theme->set_constant("hseparation", "CheckButton", 4 * EDSCALE); theme->set_constant("hseparation", "CheckButton", 4 * EDSCALE);
theme->set_constant("check_vadjust", "CheckButton", 0 * EDSCALE); theme->set_constant("check_vadjust", "CheckButton", 0);
// Checkbox // Checkbox
Ref<StyleBoxFlat> sb_checkbox = style_menu->duplicate(); Ref<StyleBoxFlat> sb_checkbox = style_menu->duplicate();
@ -712,7 +712,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("icon_color_hover", "CheckBox", icon_color_hover); theme->set_color("icon_color_hover", "CheckBox", icon_color_hover);
theme->set_constant("hseparation", "CheckBox", 4 * EDSCALE); theme->set_constant("hseparation", "CheckBox", 4 * EDSCALE);
theme->set_constant("check_vadjust", "CheckBox", 0 * EDSCALE); theme->set_constant("check_vadjust", "CheckBox", 0);
// PopupDialog // PopupDialog
theme->set_stylebox("panel", "PopupDialog", style_popup); theme->set_stylebox("panel", "PopupDialog", style_popup);
@ -1104,7 +1104,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("font_color_shadow", "RichTextLabel", Color(0, 0, 0, 0)); theme->set_color("font_color_shadow", "RichTextLabel", Color(0, 0, 0, 0));
theme->set_constant("shadow_offset_x", "RichTextLabel", 1 * EDSCALE); theme->set_constant("shadow_offset_x", "RichTextLabel", 1 * EDSCALE);
theme->set_constant("shadow_offset_y", "RichTextLabel", 1 * EDSCALE); theme->set_constant("shadow_offset_y", "RichTextLabel", 1 * EDSCALE);
theme->set_constant("shadow_as_outline", "RichTextLabel", 0 * EDSCALE); theme->set_constant("shadow_as_outline", "RichTextLabel", 0);
theme->set_stylebox("focus", "RichTextLabel", make_empty_stylebox()); theme->set_stylebox("focus", "RichTextLabel", make_empty_stylebox());
theme->set_stylebox("normal", "RichTextLabel", style_tree_bg); theme->set_stylebox("normal", "RichTextLabel", style_tree_bg);
@ -1119,7 +1119,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
theme->set_color("font_color_shadow", "Label", Color(0, 0, 0, 0)); theme->set_color("font_color_shadow", "Label", Color(0, 0, 0, 0));
theme->set_constant("shadow_offset_x", "Label", 1 * EDSCALE); theme->set_constant("shadow_offset_x", "Label", 1 * EDSCALE);
theme->set_constant("shadow_offset_y", "Label", 1 * EDSCALE); theme->set_constant("shadow_offset_y", "Label", 1 * EDSCALE);
theme->set_constant("shadow_as_outline", "Label", 0 * EDSCALE); theme->set_constant("shadow_as_outline", "Label", 0);
theme->set_constant("line_spacing", "Label", 3 * EDSCALE); theme->set_constant("line_spacing", "Label", 3 * EDSCALE);
// LinkButton // LinkButton

2
editor/icons/icon_GUI_checked.svg
View File

@ -1 +1 @@
<svg height="16" viewBox="0 0 16 15.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m3.3333333 1c-1.2887 0-2.3333333 1.0446683-2.3333333 2.3333333v9.3333337c0 1.2887 1.0446683 2.333333 2.3333333 2.333333h9.3333337c1.2887 0 2.333333-1.044668 2.333333-2.333333v-9.3333337c0-1.2887-1.044668-2.3333333-2.333333-2.3333333z" fill="#699ce8" stroke-width="1.16667"/><path d="m11.500773 3.7343508-5.6117507 5.6117502-1.7045017-1.6814543-1.4992276 1.4992276 3.2037293 3.1806817 7.1109777-7.1109775z" fill="#fff" stroke-width="1.06023"/></svg> <svg height="16" viewBox="0 0 16 15.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m3.3333333 1c-1.2887 0-2.3333333 1.0446683-2.3333333 2.3333333v9.3333337c0 1.2887 1.0446683 2.333333 2.3333333 2.333333h9.3333337c1.2887 0 2.333333-1.044668 2.333333-2.333333v-9.3333337c0-1.2887-1.044668-2.3333333-2.333333-2.3333333z" fill="#699ce8" stroke-width="1.16667"/><path d="m11.500773 3.7343508-5.6117507 5.6117502-1.7045017-1.6814543-1.4992276 1.4992276 3.2037293 3.1806817 7.1109777-7.1109775z" fill="#fefefe" stroke-width="1.06023"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 551 B

2
editor/icons/icon_GUI_radio_checked.svg
View File

@ -1 +1 @@
<svg height="16" viewBox="0 0 16 15.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m15 8a7 7 0 0 1 -7 7 7 7 0 0 1 -7-7 7 7 0 0 1 7-7 7 7 0 0 1 7 7" fill="#699ce8" stroke-width="2.33333"/><path d="m12 8a4 4 0 0 1 -4 4 4 4 0 0 1 -4-4 4 4 0 0 1 4-4 4 4 0 0 1 4 4" fill="#fff" stroke-width="1.33333"/></svg> <svg height="16" viewBox="0 0 16 15.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m15 8a7 7 0 0 1 -7 7 7 7 0 0 1 -7-7 7 7 0 0 1 7-7 7 7 0 0 1 7 7" fill="#699ce8" stroke-width="2.33333"/><path d="m12 8a4 4 0 0 1 -4 4 4 4 0 0 1 -4-4 4 4 0 0 1 4-4 4 4 0 0 1 4 4" fill="#fefefe" stroke-width="1.33333"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 323 B