From 855cfe1559fe489aaaca8d395ba791d4bd2bb40d Mon Sep 17 00:00:00 2001
From: Yuri Sizov <yuris@humnom.net>
Date: Sat, 14 Aug 2021 02:01:15 +0300
Subject: Add support for partial custom editor themes

---
 doc/classes/Theme.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'doc/classes')

diff --git a/doc/classes/Theme.xml b/doc/classes/Theme.xml
index 1124fb8084..edf5874432 100644
--- a/doc/classes/Theme.xml
+++ b/doc/classes/Theme.xml
@@ -81,19 +81,6 @@
 				Unmarks [code]theme_type[/code] as being a variation of any other type.
 			</description>
 		</method>
-		<method name="copy_default_theme">
-			<return type="void" />
-			<description>
-				Sets the theme's values to a copy of the default theme values.
-			</description>
-		</method>
-		<method name="copy_theme">
-			<return type="void" />
-			<argument index="0" name="other" type="Theme" />
-			<description>
-				Sets the theme's values to a copy of a given theme.
-			</description>
-		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color" />
 			<argument index="0" name="name" type="StringName" />
@@ -340,6 +327,14 @@
 				Returns [code]true[/code] if [code]theme_type[/code] is marked as a variation of [code]base_type[/code] in this theme.
 			</description>
 		</method>
+		<method name="merge_with">
+			<return type="void" />
+			<argument index="0" name="other" type="Theme" />
+			<description>
+				Adds missing and overrides existing definitions with values from the [code]other[/code] [Theme].
+				[b]Note:[/b] This modifies the current theme. If you want to merge two themes together without modifying either one, create a new empty theme and merge the other two into it one after another.
+			</description>
+		</method>
 		<method name="rename_color">
 			<return type="void" />
 			<argument index="0" name="old_name" type="StringName" />
-- 
cgit v1.2.3