Skip to content

Commit 95742d3

Browse files
mhilbrunnermhilbrunner
authored
Merge pull request #9072 from godotengine/classref/sync-bfa866c
classref: Sync with current master branch (bfa866c)
2 parents fce8f25 + b783165 commit 95742d3

40 files changed

+2183
-160
lines changed

‎classes/[email protected]‎

Lines changed: 61 additions & 16 deletions
Large diffs are not rendered by default.

‎classes/[email protected]‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Properties
7777
+---------------------------------------------------------------+-------------------------------------------------------------------------------------+
7878
| :ref:`Marshalls<class_Marshalls>` | :ref:`Marshalls<class_@GlobalScope_property_Marshalls>` |
7979
+---------------------------------------------------------------+-------------------------------------------------------------------------------------+
80+
| :ref:`NativeMenu<class_NativeMenu>` | :ref:`NativeMenu<class_@GlobalScope_property_NativeMenu>` |
81+
+---------------------------------------------------------------+-------------------------------------------------------------------------------------+
8082
| :ref:`NavigationMeshGenerator<class_NavigationMeshGenerator>` | :ref:`NavigationMeshGenerator<class_@GlobalScope_property_NavigationMeshGenerator>` |
8183
+---------------------------------------------------------------+-------------------------------------------------------------------------------------+
8284
| :ref:`NavigationServer2D<class_NavigationServer2D>` | :ref:`NavigationServer2D<class_@GlobalScope_property_NavigationServer2D>` |
@@ -4957,6 +4959,20 @@ The :ref:`Marshalls<class_Marshalls>` singleton.
49574959

49584960
----
49594961

4962+
.. _class_@GlobalScope_property_NativeMenu:
4963+
4964+
.. rst-class:: classref-property
4965+
4966+
:ref:`NativeMenu<class_NativeMenu>` **NativeMenu**
4967+
4968+
The :ref:`NativeMenu<class_NativeMenu>` singleton.
4969+
4970+
\ **Note:** Only implemented on macOS.
4971+
4972+
.. rst-class:: classref-item-separator
4973+
4974+
----
4975+
49604976
.. _class_@GlobalScope_property_NavigationMeshGenerator:
49614977

49624978
.. rst-class:: classref-property

‎classes/class_dictionary.rst‎

Lines changed: 60 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -226,39 +226,41 @@ Methods
226226
.. table::
227227
:widths: auto
228228

229-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
230-
| |void| | :ref:`clear<class_Dictionary_method_clear>`\ (\ ) |
231-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
232-
| :ref:`Dictionary<class_Dictionary>` | :ref:`duplicate<class_Dictionary_method_duplicate>`\ (\ deep\: :ref:`bool<class_bool>` = false\ ) |const| |
233-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
234-
| :ref:`bool<class_bool>` | :ref:`erase<class_Dictionary_method_erase>`\ (\ key\: :ref:`Variant<class_Variant>`\ ) |
235-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
236-
| :ref:`Variant<class_Variant>` | :ref:`find_key<class_Dictionary_method_find_key>`\ (\ value\: :ref:`Variant<class_Variant>`\ ) |const| |
237-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
238-
| :ref:`Variant<class_Variant>` | :ref:`get<class_Dictionary_method_get>`\ (\ key\: :ref:`Variant<class_Variant>`, default\: :ref:`Variant<class_Variant>` = null\ ) |const| |
239-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
240-
| :ref:`Variant<class_Variant>` | :ref:`get_or_add<class_Dictionary_method_get_or_add>`\ (\ key\: :ref:`Variant<class_Variant>`, default\: :ref:`Variant<class_Variant>` = null\ ) |
241-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
242-
| :ref:`bool<class_bool>` | :ref:`has<class_Dictionary_method_has>`\ (\ key\: :ref:`Variant<class_Variant>`\ ) |const| |
243-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
244-
| :ref:`bool<class_bool>` | :ref:`has_all<class_Dictionary_method_has_all>`\ (\ keys\: :ref:`Array<class_Array>`\ ) |const| |
245-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
246-
| :ref:`int<class_int>` | :ref:`hash<class_Dictionary_method_hash>`\ (\ ) |const| |
247-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
248-
| :ref:`bool<class_bool>` | :ref:`is_empty<class_Dictionary_method_is_empty>`\ (\ ) |const| |
249-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
250-
| :ref:`bool<class_bool>` | :ref:`is_read_only<class_Dictionary_method_is_read_only>`\ (\ ) |const| |
251-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
252-
| :ref:`Array<class_Array>` | :ref:`keys<class_Dictionary_method_keys>`\ (\ ) |const| |
253-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
254-
| |void| | :ref:`make_read_only<class_Dictionary_method_make_read_only>`\ (\ ) |
255-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
256-
| |void| | :ref:`merge<class_Dictionary_method_merge>`\ (\ dictionary\: :ref:`Dictionary<class_Dictionary>`, overwrite\: :ref:`bool<class_bool>` = false\ ) |
257-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
258-
| :ref:`int<class_int>` | :ref:`size<class_Dictionary_method_size>`\ (\ ) |const| |
259-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
260-
| :ref:`Array<class_Array>` | :ref:`values<class_Dictionary_method_values>`\ (\ ) |const| |
261-
+-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
229+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
230+
| |void| | :ref:`clear<class_Dictionary_method_clear>`\ (\ ) |
231+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
232+
| :ref:`Dictionary<class_Dictionary>` | :ref:`duplicate<class_Dictionary_method_duplicate>`\ (\ deep\: :ref:`bool<class_bool>` = false\ ) |const| |
233+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
234+
| :ref:`bool<class_bool>` | :ref:`erase<class_Dictionary_method_erase>`\ (\ key\: :ref:`Variant<class_Variant>`\ ) |
235+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
236+
| :ref:`Variant<class_Variant>` | :ref:`find_key<class_Dictionary_method_find_key>`\ (\ value\: :ref:`Variant<class_Variant>`\ ) |const| |
237+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
238+
| :ref:`Variant<class_Variant>` | :ref:`get<class_Dictionary_method_get>`\ (\ key\: :ref:`Variant<class_Variant>`, default\: :ref:`Variant<class_Variant>` = null\ ) |const| |
239+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
240+
| :ref:`Variant<class_Variant>` | :ref:`get_or_add<class_Dictionary_method_get_or_add>`\ (\ key\: :ref:`Variant<class_Variant>`, default\: :ref:`Variant<class_Variant>` = null\ ) |
241+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
242+
| :ref:`bool<class_bool>` | :ref:`has<class_Dictionary_method_has>`\ (\ key\: :ref:`Variant<class_Variant>`\ ) |const| |
243+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
244+
| :ref:`bool<class_bool>` | :ref:`has_all<class_Dictionary_method_has_all>`\ (\ keys\: :ref:`Array<class_Array>`\ ) |const| |
245+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
246+
| :ref:`int<class_int>` | :ref:`hash<class_Dictionary_method_hash>`\ (\ ) |const| |
247+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
248+
| :ref:`bool<class_bool>` | :ref:`is_empty<class_Dictionary_method_is_empty>`\ (\ ) |const| |
249+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
250+
| :ref:`bool<class_bool>` | :ref:`is_read_only<class_Dictionary_method_is_read_only>`\ (\ ) |const| |
251+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
252+
| :ref:`Array<class_Array>` | :ref:`keys<class_Dictionary_method_keys>`\ (\ ) |const| |
253+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
254+
| |void| | :ref:`make_read_only<class_Dictionary_method_make_read_only>`\ (\ ) |
255+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
256+
| |void| | :ref:`merge<class_Dictionary_method_merge>`\ (\ dictionary\: :ref:`Dictionary<class_Dictionary>`, overwrite\: :ref:`bool<class_bool>` = false\ ) |
257+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
258+
| :ref:`Dictionary<class_Dictionary>` | :ref:`merged<class_Dictionary_method_merged>`\ (\ dictionary\: :ref:`Dictionary<class_Dictionary>`, overwrite\: :ref:`bool<class_bool>` = false\ ) |const| |
259+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
260+
| :ref:`int<class_int>` | :ref:`size<class_Dictionary_method_size>`\ (\ ) |const| |
261+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
262+
| :ref:`Array<class_Array>` | :ref:`values<class_Dictionary_method_values>`\ (\ ) |const| |
263+
+-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
262264

263265
.. rst-class:: classref-reftable-group
264266

@@ -592,6 +594,31 @@ Adds entries from ``dictionary`` to this dictionary. By default, duplicate keys
592594

593595
----
594596

597+
.. _class_Dictionary_method_merged:
598+
599+
.. rst-class:: classref-method
600+
601+
:ref:`Dictionary<class_Dictionary>` **merged**\ (\ dictionary\: :ref:`Dictionary<class_Dictionary>`, overwrite\: :ref:`bool<class_bool>` = false\ ) |const|
602+
603+
Returns a copy of this dictionary merged with the other ``dictionary``. By default, duplicate keys are not copied over, unless ``overwrite`` is ``true``. See also :ref:`merge<class_Dictionary_method_merge>`.
604+
605+
This method is useful for quickly making dictionaries with default values:
606+
607+
::
608+
609+
var base = { "fruit": "apple", "vegetable": "potato" }
610+
var extra = { "fruit": "orange", "dressing": "vinegar" }
611+
# Prints { "fruit": "orange", "vegetable": "potato", "dressing": "vinegar" }
612+
print(extra.merged(base))
613+
# Prints { "fruit": "apple", "vegetable": "potato", "dressing": "vinegar" }
614+
print(extra.merged(base, true))
615+
616+
See also :ref:`merge<class_Dictionary_method_merge>`.
617+
618+
.. rst-class:: classref-item-separator
619+
620+
----
621+
595622
.. _class_Dictionary_method_size:
596623

597624
.. rst-class:: classref-method

0 commit comments

Comments
 (0)