diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-24 15:48:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 15:48:55 +0200 |
| commit | c432ce4ee15fc396b2bccbbe2661b5bd34b9bee1 (patch) | |
| tree | b6f8f478093fadbed631c0b93e9774e7c94415d3 /editor | |
| parent | 1f18a85ea1f79f023bc051bc43f80461325007e9 (diff) | |
| parent | 943d0a90f563ccbe2e3fd631746aba5c14af043c (diff) | |
Merge pull request #22400 from Chaosus/viewport_color
Added viewport border color setting for canvas item editor
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 29ce8d1830..2dec21fffb 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -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); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 2ea17fda1c..72451cfcb7 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -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")); |