Forráskód Böngészése

Merge pull request #57834 from Sauermann/fix-popup-control

Rémi Verschelde 3 éve
szülő
commit
2c28729122
2 módosított fájl, 5 hozzáadás és 5 törlés
  1. 4 4
      doc/classes/Popup.xml
  2. 1 1
      doc/classes/PopupMenu.xml

+ 4 - 4
doc/classes/Popup.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="Popup" inherits="Window" version="4.0">
 	<brief_description>
-		Base container control for popups and dialogs.
+		Popup is a base window container for popup-like subwindows.
 	</brief_description>
 	<description>
-		Popup is a base [Control] used to show dialogs and popups. It's a subwindow and modal by default (see [Control]) and has helpers for custom popup behavior.
+		Popup is a base window container for popup-like subwindows. It's a modal by default (see [member close_on_parent_focus]) and has helpers for custom popup behavior.
 	</description>
 	<tutorials>
 	</tutorials>
 	<members>
 		<member name="borderless" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
 		<member name="close_on_parent_focus" type="bool" setter="set_close_on_parent_focus" getter="get_close_on_parent_focus" default="true">
-			If [code]true[/code], the [Popup] will close when its parent is focused.
+			If true, the [Popup] will close when its parent [Window] is focused.
 		</member>
 		<member name="transient" type="bool" setter="set_transient" getter="is_transient" overrides="Window" default="true" />
 		<member name="unresizable" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
@@ -21,7 +21,7 @@
 	<signals>
 		<signal name="popup_hide">
 			<description>
-				Emitted when a popup is hidden.
+				Emitted when the popup is hidden.
 			</description>
 		</signal>
 	</signals>

+ 1 - 1
doc/classes/PopupMenu.xml

@@ -4,7 +4,7 @@
 		PopupMenu displays a list of options.
 	</brief_description>
 	<description>
-		[PopupMenu] is a [Control] that displays a list of options. They are popular in toolbars or context menus.
+		[PopupMenu] is a modal window used to display a list of options. They are popular in toolbars or context menus.
 		The size of a [PopupMenu] can be limited by using [member Window.max_size]. If the height of the list of items is larger than the maximum height of the [PopupMenu], a [ScrollContainer] within the popup will allow the user to scroll the contents.
 		If no maximum size is set, or if it is set to 0, the [PopupMenu] height will be limited by its parent rect.
 	</description>