diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-17 13:13:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 13:13:08 +0200 |
| commit | 45344c6a025b029ec864a6d9b7a1723fb43f4ab6 (patch) | |
| tree | 6bcd94c65ee3302a465f9d4c3ad1529cb860b540 /doc/classes/Theme.xml | |
| parent | e1754c0a1336ef12992b6c4e19fef74afa3b14c1 (diff) | |
| parent | 855cfe1559fe489aaaca8d395ba791d4bd2bb40d (diff) | |
Merge pull request #51651 from pycbouh/editor-merge-custom-theme
Add support for partial custom editor themes
Diffstat (limited to 'doc/classes/Theme.xml')
| -rw-r--r-- | doc/classes/Theme.xml | 21 |
1 files changed, 8 insertions, 13 deletions
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" /> |