Skip to content

Commit 0994736

Browse files
committed
Merge pull request #100312 from KoBeWi/rule_out_ruler_warnings
Fix 3D ruler theme overrides
2 parents 3877573 + 1bc70fe commit 0994736

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

editor/plugins/node_3d_editor_plugin.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3254,6 +3254,12 @@ void Node3DEditorViewport::_notification(int p_what) {
32543254

32553255
cinema_label->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
32563256
locked_label->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
3257+
3258+
ruler_label->add_theme_color_override(SceneStringName(font_color), Color(1.0, 0.9, 0.0, 1.0));
3259+
ruler_label->add_theme_color_override("font_outline_color", Color(0.0, 0.0, 0.0, 1.0));
3260+
ruler_label->add_theme_constant_override("outline_size", 4 * EDSCALE);
3261+
ruler_label->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
3262+
ruler_label->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
32573263
} break;
32583264

32593265
case NOTIFICATION_DRAG_END: {
@@ -5827,11 +5833,6 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
58275833
ruler_line_xray->set_material_override(ruler_material_xray);
58285834

58295835
ruler_label = memnew(Label);
5830-
ruler_label->add_theme_color_override(SceneStringName(font_color), Color(1.0, 0.9, 0.0, 1.0));
5831-
ruler_label->add_theme_color_override("font_outline_color", Color(0.0, 0.0, 0.0, 1.0));
5832-
ruler_label->add_theme_constant_override("outline_size", 4 * EDSCALE);
5833-
ruler_label->add_theme_font_size_override(SceneStringName(font_size), 15 * EDSCALE);
5834-
ruler_label->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
58355836
ruler_label->set_visible(false);
58365837

58375838
ruler->add_child(ruler_start_point);

0 commit comments

Comments
 (0)