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

Merge pull request #22400 from Chaosus/viewport_color 

Added viewport border color setting for canvas item editor
This commit is contained in:
Rémi Verschelde 2018-09-24 15:48:55 +02:00 committed by GitHub
parent 1f18a85ea1 943d0a90f5
commit c432ce4ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_settings.cpp
View File

@ -485,6 +485,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("editors/2d/bone_outline_color", Color(0.35, 0.35, 0.35));
_initial_set("editors/2d/bone_outline_size", 2);
_initial_set("editors/2d/keep_margins_when_changing_anchors", false);
_initial_set("editors/2d/viewport_border_color", Color(0.4, 0.4, 1.0, 0.4));
_initial_set("editors/2d/warped_mouse_panning", true);
_initial_set("editors/2d/simple_spacebar_panning", false);
_initial_set("editors/2d/scroll_to_pan", false);

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2815,7 +2815,7 @@ void CanvasItemEditor::_draw_axis() {
RID ci = viewport->get_canvas_item();
Color area_axis_color(0.4, 0.4, 1.0, 0.4);
Color area_axis_color = EditorSettings::get_singleton()->get("editors/2d/viewport_border_color");
Size2 screen_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));