From e757bd5f428d5af7bbac9ff72c7d430f2fac77f5 Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Mon, 17 Jul 2023 17:45:29 -0700 Subject: [PATCH 1/3] Adds list of supported multi-touch gestures --- .../configuration/hardware.rst | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/manual/getting_started/configuration/hardware.rst b/manual/getting_started/configuration/hardware.rst index fd6db8d6b..7f3e4c913 100644 --- a/manual/getting_started/configuration/hardware.rst +++ b/manual/getting_started/configuration/hardware.rst @@ -21,8 +21,9 @@ Blender supports various types of input devices: - Keyboard (recommended: keyboard with numeric keypad, English layout works best) - Mouse (recommended: three button mouse with scroll wheel) -- NDOF Device (also known as *3D Mouse*) - Graphic Tablet +- Touchpad +- NDOF Device (also known as *3D Mouse*) .. note:: @@ -100,6 +101,27 @@ as well as provide additional controls such as pressure sensitivity. .. _hardware-ndof: +Touchpad +-------- + +Touchpad controls are available on Windows or macOS, and control the mouse cursor using your fingers. +If you are working from a laptop without a mouse, +you can emulate controls using multi-touch gestures with the trackpad from :doc:`Preferences `. + +.. list-table:: Supported multi-touch gestures + :header-rows: 1 + + * - Gesture + - Effect + * - Pan + - Hold the :kbd:`Shift` key while dragging two fingers on the pad. + * - Zoom + - Hold the :kbd:`Alt` or :kbd:`OSKey` key while dragging two fingers on the pad. + * - Rotate + - Drag two fingers on the pad. + * - Emulate right-click + - Tap two fingers on the pad. + NDOF (3D Mouse) --------------- -- 2.30.2 From ee15a3068a77e7aba91d8d661ffb4fa9d8c0e3aa Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Wed, 19 Jul 2023 17:57:16 -0700 Subject: [PATCH 2/3] applies requested updates --- manual/editors/preferences/input.rst | 4 ++-- manual/getting_started/configuration/hardware.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manual/editors/preferences/input.rst b/manual/editors/preferences/input.rst index f01242835..a7e314450 100644 --- a/manual/editors/preferences/input.rst +++ b/manual/editors/preferences/input.rst @@ -104,11 +104,11 @@ Touchpad .. note:: - This panel is only available on Windows or macOS. + This panel is available on Windows, macOS, or Linux with Wayland. Multi-touch Gestures Use multi-touch gestures for navigation with touchpad, instead of scroll wheel emulation. - + For more detail on supported gestures, see :doc:`Configuring Peripherals `. Tablet ====== diff --git a/manual/getting_started/configuration/hardware.rst b/manual/getting_started/configuration/hardware.rst index 7f3e4c913..e5fb409ba 100644 --- a/manual/getting_started/configuration/hardware.rst +++ b/manual/getting_started/configuration/hardware.rst @@ -104,7 +104,7 @@ as well as provide additional controls such as pressure sensitivity. Touchpad -------- -Touchpad controls are available on Windows or macOS, and control the mouse cursor using your fingers. +Touchpad controls are available on Windows, macOS and Linux with Wayland. If you are working from a laptop without a mouse, you can emulate controls using multi-touch gestures with the trackpad from :doc:`Preferences `. @@ -117,7 +117,7 @@ you can emulate controls using multi-touch gestures with the trackpad from :doc: - Hold the :kbd:`Shift` key while dragging two fingers on the pad. * - Zoom - Hold the :kbd:`Alt` or :kbd:`OSKey` key while dragging two fingers on the pad. - * - Rotate + * - Orbit - Drag two fingers on the pad. * - Emulate right-click - Tap two fingers on the pad. -- 2.30.2 From 2eeb794fc6fe8001209682a92dcd402c9b312735 Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Thu, 20 Jul 2023 08:40:48 -0700 Subject: [PATCH 3/3] improving phrasing and fixing typo (Alt -> Ctrl) for zoom gesture --- manual/editors/preferences/input.rst | 2 +- manual/getting_started/configuration/hardware.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manual/editors/preferences/input.rst b/manual/editors/preferences/input.rst index a7e314450..9e07bd5c3 100644 --- a/manual/editors/preferences/input.rst +++ b/manual/editors/preferences/input.rst @@ -104,7 +104,7 @@ Touchpad .. note:: - This panel is available on Windows, macOS, or Linux with Wayland. + This panel is available on Windows, macOS, and Linux with Wayland. Multi-touch Gestures Use multi-touch gestures for navigation with touchpad, instead of scroll wheel emulation. diff --git a/manual/getting_started/configuration/hardware.rst b/manual/getting_started/configuration/hardware.rst index e5fb409ba..84992abe5 100644 --- a/manual/getting_started/configuration/hardware.rst +++ b/manual/getting_started/configuration/hardware.rst @@ -116,7 +116,7 @@ you can emulate controls using multi-touch gestures with the trackpad from :doc: * - Pan - Hold the :kbd:`Shift` key while dragging two fingers on the pad. * - Zoom - - Hold the :kbd:`Alt` or :kbd:`OSKey` key while dragging two fingers on the pad. + - Hold the :kbd:`Ctrl` or :kbd:`OSKey` key while dragging two fingers on the pad. * - Orbit - Drag two fingers on the pad. * - Emulate right-click -- 2.30.2