Merge pull request godotengine#10437 from groud/2d_editor_enhancements

Some 2d editor enhancements
aizcn · Sep 19, 2017 · 2785444 · 2785444
2 parents d1ecc25 + b5f29fe
commit 2785444
Show file tree

Hide file tree

Showing 10 changed files with 1,187 additions and 524 deletions.
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
@@ -137,6 +137,9 @@ void editor_register_fonts(Ref<Theme> p_theme) {
 	p_theme->set_font("doc", "EditorFonts", df_doc);
 	p_theme->set_font("doc_title", "EditorFonts", df_title);
 
+	MAKE_DEFAULT_FONT(df_rulers, int(EDITOR_DEF("canvas_item_editor/rulers", 8)) * EDSCALE);
+	p_theme->set_font("rulers", "EditorFonts", df_rulers);
+
 	Ref<DynamicFont> df_code;
 	df_code.instance();
 	df_code->set_size(int(EditorSettings::get_singleton()->get("interface/source_font_size")) * EDSCALE);

diff --git a/editor/icons/icon_snap.svg b/editor/icons/icon_snap.svg
diff --git a/editor/icons/icon_snap_grid.svg b/editor/icons/icon_snap_grid.svg