diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-14 16:00:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 16:00:02 +0100 |
| commit | fc7adaab7b3856a7831d402ea2bbb27efe7b7d8a (patch) | |
| tree | 23902b836784f4c823d69f200b6aa2c1cffbc9f6 /doc | |
| parent | 258ea41ffa00a71bbb6ba9844840f18ba5802816 (diff) | |
| parent | 38c0ad7c6c6b70f1ecac0a7962a60c3105b3d8e8 (diff) | |
Merge pull request #74907 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.1) - 3rd batch
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/classes/OS.xml | 1 | ||||
| -rw-r--r-- | doc/classes/String.xml | 4 | ||||
| -rw-r--r-- | doc/classes/Window.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index ca090d596e..92ee2fb40b 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -634,6 +634,7 @@ - [code]OS.shell_open("https://godotengine.org")[/code] opens the default web browser on the official Godot website. - [code]OS.shell_open("mailto:example@example.com")[/code] opens the default email client with the "To" field set to [code]example@example.com[/code]. See [url=https://datatracker.ietf.org/doc/html/rfc2368]RFC 2368 - The [code]mailto[/code] URL scheme[/url] for a list of fields that can be added. Use [method ProjectSettings.globalize_path] to convert a [code]res://[/code] or [code]user://[/code] path into a system path for use with this method. + [b]Note:[/b] Use [method String.uri_encode] to encode characters within URLs in a URL-safe, portable way. This is especially required for line breaks. Otherwise, [method shell_open] may not work correctly in a project exported to the Web platform. [b]Note:[/b] This method is implemented on Android, iOS, Web, Linux, macOS and Windows. </description> </method> diff --git a/doc/classes/String.xml b/doc/classes/String.xml index 53b34332d7..5e443b018c 100644 --- a/doc/classes/String.xml +++ b/doc/classes/String.xml @@ -970,7 +970,7 @@ <method name="uri_decode" qualifiers="const"> <return type="String" /> <description> - Decodes the string from its URL-encoded format. This method is meant to properly decode the parameters in a URL when receiving an HTTP request. + Decodes the string from its URL-encoded format. This method is meant to properly decode the parameters in a URL when receiving an HTTP request. See also [method uri_encode]. [codeblocks] [gdscript] var url = "$DOCS_URL/?highlight=Godot%20Engine%3%docs" @@ -986,7 +986,7 @@ <method name="uri_encode" qualifiers="const"> <return type="String" /> <description> - Encodes the string to URL-friendly format. This method is meant to properly encode the parameters in a URL when sending an HTTP request. + Encodes the string to URL-friendly format. This method is meant to properly encode the parameters in a URL when sending an HTTP request. See also [method uri_decode]. [codeblocks] [gdscript] var prefix = "$DOCS_URL/?highlight=" diff --git a/doc/classes/Window.xml b/doc/classes/Window.xml index b8f731809a..a8237efd16 100644 --- a/doc/classes/Window.xml +++ b/doc/classes/Window.xml @@ -530,7 +530,7 @@ [b]Note:[/b] Fullscreen mode is not exclusive full screen on Windows and Linux. </member> <member name="mouse_passthrough" type="bool" setter="set_flag" getter="get_flag" default="false"> - If [code]true[/code], all mouse event as passed to the underlying window of the same application. See also [member mouse_passthrough_polygon]. + If [code]true[/code], all mouse events will be passed to the underlying window of the same application. See also [member mouse_passthrough_polygon]. [b]Note:[/b] This property is implemented on Linux (X11), macOS and Windows. </member> <member name="mouse_passthrough_polygon" type="PackedVector2Array" setter="set_mouse_passthrough_polygon" getter="get_mouse_passthrough_polygon" default="PackedVector2Array()"> |