From fac37c66c1ac7c7a543e35545c8aca1edd801057 Mon Sep 17 00:00:00 2001 From: passivestar <60579014+passivestar@users.noreply.github.com> Date: Wed, 12 Nov 2025 12:14:11 +0400 Subject: [PATCH] Fix 2d ruler visibility in modern theme --- editor/scene/canvas_item_editor_plugin.cpp | 4 ++-- editor/themes/theme_classic.cpp | 1 + editor/themes/theme_modern.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index 0986bdcab00..e7c0eadbc96 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -3170,10 +3170,10 @@ void CanvasItemEditor::_draw_smart_snapping() { } void CanvasItemEditor::_draw_rulers() { - Color bg_color = get_theme_color(SNAME("dark_color_2"), EditorStringName(Editor)); + Color bg_color = get_theme_color(SNAME("ruler_color"), EditorStringName(Editor)); Color graduation_color = get_theme_color(SceneStringName(font_color), EditorStringName(Editor)).lerp(bg_color, 0.5); Color font_color = get_theme_color(SceneStringName(font_color), EditorStringName(Editor)); - font_color.a = 0.8; + font_color.a = 0.9; Ref font = get_theme_font(SNAME("rulers"), EditorStringName(EditorFonts)); real_t ruler_tick_scale = ruler_width_scaled / 15.0; const String lang = _get_locale(); diff --git a/editor/themes/theme_classic.cpp b/editor/themes/theme_classic.cpp index 146d811fd41..d92a4084fbc 100644 --- a/editor/themes/theme_classic.cpp +++ b/editor/themes/theme_classic.cpp @@ -86,6 +86,7 @@ void ThemeClassic::populate_shared_styles(const Ref &p_theme, Edito p_theme->set_color("success_color", EditorStringName(Editor), p_config.success_color); p_theme->set_color("warning_color", EditorStringName(Editor), p_config.warning_color); p_theme->set_color("error_color", EditorStringName(Editor), p_config.error_color); + p_theme->set_color("ruler_color", EditorStringName(Editor), p_config.dark_color_2); #ifndef DISABLE_DEPRECATED // Used before 4.3. p_theme->set_color("disabled_highlight_color", EditorStringName(Editor), p_config.highlight_disabled_color); #endif diff --git a/editor/themes/theme_modern.cpp b/editor/themes/theme_modern.cpp index 69eb6fbc3f8..ae4bf0edf46 100644 --- a/editor/themes/theme_modern.cpp +++ b/editor/themes/theme_modern.cpp @@ -97,6 +97,7 @@ void ThemeModern::populate_shared_styles(const Ref &p_theme, Editor p_theme->set_color("success_color", EditorStringName(Editor), p_config.success_color); p_theme->set_color("warning_color", EditorStringName(Editor), p_config.warning_color); p_theme->set_color("error_color", EditorStringName(Editor), p_config.error_color); + p_theme->set_color("ruler_color", EditorStringName(Editor), p_config.base_color.lerp(p_config.mono_color_inv, 0.3) * Color(1, 1, 1, 0.8)); #ifndef DISABLE_DEPRECATED // Used before 4.3. p_theme->set_color("disabled_highlight_color", EditorStringName(Editor), p_config.highlight_disabled_color); #endif