From 94e1943f024f460e52e25e864c5e5b06ae6da231 Mon Sep 17 00:00:00 2001
From: Markus Sauermann <6299227+Sauermann@users.noreply.github.com>
Date: Thu, 28 Mar 2024 21:07:27 +0100
Subject: [PATCH] Make `TextEdit.clip_contents` more transparent to users

Instead of ignoring `TextEdit.clip_contents`, use it with a default
value `true`. in the same way as `RichTextLabel`.
---
 doc/classes/TextEdit.xml | 1 +
 scene/gui/text_edit.cpp  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/classes/TextEdit.xml b/doc/classes/TextEdit.xml
index 92b54eef21f..db0c1f17b0e 100644
--- a/doc/classes/TextEdit.xml
+++ b/doc/classes/TextEdit.xml
@@ -1132,6 +1132,7 @@
 		<member name="caret_type" type="int" setter="set_caret_type" getter="get_caret_type" enum="TextEdit.CaretType" default="0">
 			Set the type of caret to draw.
 		</member>
+		<member name="clip_contents" type="bool" setter="set_clip_contents" getter="is_clipping_contents" overrides="Control" default="true" />
 		<member name="context_menu_enabled" type="bool" setter="set_context_menu_enabled" getter="is_context_menu_enabled" default="true">
 			If [code]true[/code], a right-click displays the context menu.
 		</member>
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index a7cd18e1a8f..6e316714754 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -539,7 +539,6 @@ void TextEdit::_notification(int p_what) {
 			_update_scrollbars();
 
 			RID ci = get_canvas_item();
-			RenderingServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true);
 			int xmargin_beg = theme_cache.style_normal->get_margin(SIDE_LEFT) + gutters_width + gutter_padding;
 
 			int xmargin_end = size.width - theme_cache.style_normal->get_margin(SIDE_RIGHT);
@@ -8022,5 +8021,6 @@ TextEdit::TextEdit(const String &p_placeholder) {
 
 	set_placeholder(p_placeholder);
 
+	set_clip_contents(true);
 	set_editable(true);
 }