Skip to content

Commit 43bcea0

Browse files
authored
Merge pull request #8932 from skyace65/macOS-Opt
Replace "alt" with "opt" for macOS shortcuts
2 parents 74b247b + 1755245 commit 43bcea0

File tree

4 files changed

+41
-37
lines changed

4 files changed

+41
-37
lines changed

contributing/documentation/docs_writing_guidelines.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,12 @@ out form (:kbd:`Control`/:kbd:`Command`). For combinations, use the ``+`` symbol
497497
with a space on either side of the symbol.
498498

499499
Make sure to mention shortcuts that differ on macOS compared to other platforms.
500-
On macOS, ``Cmd`` often replaces ``Ctrl`` in keyboard shortcuts.
500+
You can find a list of all shortcuts, including what they are on macOS, on
501+
:ref:`this page <doc_default_key_mapping>`.
501502

502503
Try to integrate the shortcut into sentences the best you can. Here are some
503504
examples with the ``:kbd:`` tag left as-is for better visibility:
504505

505-
- Press ``:kbd:`Ctrl + Alt + T``` to toggle the panel (``:kbd:`Cmd + Alt + T``` on macOS).
506+
- Press ``:kbd:`Ctrl + Alt + T``` to toggle the panel (``:kbd:`Opt + Cmd + T``` on macOS).
506507
- Press ``:kbd:`Space``` and hold the left mouse button to pan in the 2D editor.
507508
- Press ``:kbd:`Shift + Up Arrow``` to move the node upwards by 8 pixels.

getting_started/first_3d_game/04.mob_scene.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@ Leaving the screen
216216
We still have to destroy the mobs when they leave the screen. To do so, we'll
217217
connect our :ref:`VisibleOnScreenNotifier3D <class_VisibleOnScreenNotifier3D>` node's ``screen_exited`` signal to the ``Mob``.
218218

219+
Head back to the 3D viewport by clicking on the *3D* label at the top of the
220+
editor. You can also press :kbd:`Ctrl + F2` (:kbd:`Opt + 2` on macOS).
221+
219222
|image8|
220223

221224
Select the :ref:`VisibleOnScreenNotifier3D <class_VisibleOnScreenNotifier3D>` node and on the right side of the interface,

getting_started/introduction/first_look_at_the_editor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Godot comes with a built-in class reference.
136136
You can search for information about a class, method, property, constant, or
137137
signal by any one of the following methods:
138138

139-
* Pressing :kbd:`F1` (or :kbd:`Alt + Space` on macOS, or :kbd:`fn + F1` for laptops with a :kbd:`fn` key) anywhere in the editor.
139+
* Pressing :kbd:`F1` (or :kbd:`Opt + Space` on macOS, or :kbd:`fn + F1` for laptops with a :kbd:`fn` key) anywhere in the editor.
140140
* Clicking the "Search Help" button in the top-right of the Script main screen.
141141
* Clicking on the Help menu and Search Help.
142142
* Clicking while pressing the :kbd:`Ctrl` key on a class name, function name,

0 commit comments

Comments
 (0)