summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-09-22 09:20:52 +0200
committerGitHub <noreply@github.com>2017-09-22 09:20:52 +0200
commitb8d7dd22e85941b09c7c76ea565f89d1994e6d3d (patch)
tree4122c6a9135b50823569ae299d886271d0fc69a5 /editor
parenta0d843910fbc56aa55fff68dd84ce2eaee739ed2 (diff)
parent56a80625e59fd57e4f8e13811c950d769abbc982 (diff)
Merge pull request #11487 from groud/viewport_base_clip
Fixes the rulers text drawn outside the viewport_base [ci skip]
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index e621394a07..c58ccb55a8 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -3710,6 +3710,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
viewport_base = memnew(Control);
palette_split->add_child(viewport_base);
+ viewport_base->set_clip_contents(true);
viewport_base->connect("draw", this, "_draw_viewport_base");
viewport_base->connect("gui_input", this, "_viewport_base_gui_input");
viewport_base->set_focus_mode(FOCUS_ALL);