Fix #110848: Trackpad: Allow changing the speed while fly navigating #110930

Open

YimingWu wants to merge 5 commits from ChengduLittleA/blender:fix-110848 into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

YimingWu commented

2023-08-08 15:44:39 +02:00

Member

The code is already here, it was just lost during refactoring earlier.

This feature was added in 4737e08cb9 and in 3064da1200
keymap was lost, just because it wasn't added to the fly_modal_keymap
initially. This patch just adds FLY_MODAL_SPEED to modal map
so it can be selected in the keymap.

This patch was originally authored by Yevgeny Makarov (@jenkm) as
https://archive.blender.org/developer/D9641 , now porting this as a PR.

The code is already here, it was just lost during refactoring earlier. This feature was added in 4737e08cb9a5 and in 3064da1200a9 keymap was lost, just because it wasn't added to the fly_modal_keymap initially. This patch just adds FLY_MODAL_SPEED to modal map so it can be selected in the keymap. This patch was originally authored by Yevgeny Makarov (@jenkm) as https://archive.blender.org/developer/D9641 , now porting this as a PR.

YimingWu added the

labels 2023-08-08 15:44:39 +02:00

YimingWu added 1 commit 2023-08-08 15:44:49 +02:00

51cda19c8f Fix #110848 : Trackpad: Allow changing the speed while fly navigating

The code is already here, it was just lost during refactoring earlier.

This feature was added in rB4737e08cb9a5 and in rB3064da1200a9
keymap was lost, just because it wasn't added to the fly_modal_keymap
initially. This patch just adds FLY_MODAL_SPEED to modal map
so it can be selected in the keymap.

Also replace 'delta' with proper 'absolute delta'
so that the upward movement always increases the speed,
regardless of the Natural Scroll Direction preference.

This patch was originally authored by Yevgeny Makarov (@jenkm) as
https://archive.blender.org/developer/D9641 , now porting this as a PR.

YimingWu added 1 commit 2023-08-09 04:21:04 +02:00

840d38731c Use `U.scale_factor / UI_SCALE_FAC` to replace `U.dpi_fac`

YimingWu added 1 commit 2023-08-09 16:12:55 +02:00

1ab8448c71 Misunderstood UI_SCALE_FAC, correcting.

Pratik Borhade commented

2023-08-18 13:48:15 +02:00

Member

Can confirm this fixes the fly navigation with trackpad.
@brecht , can you review this?

Can confirm this fixes the fly navigation with trackpad. @brecht , can you review this?

Yevgeny Makarov commented

2023-08-18 13:58:29 +02:00

Member

Some fixes from #111141 are included here, so only the first two lines directly relate to this fix, sorry for the mess.

Some fixes from #111141 are included here, so only the first two lines directly relate to this fix, sorry for the mess.

YimingWu commented

2023-08-19 05:28:49 +02:00

Author

Member

@jenkm should I simply remove the change in transform.cc?

@jenkm should I simply remove the change in `transform.cc`?

Yevgeny Makarov commented

2023-08-19 09:56:27 +02:00

Member

@ChengduLittleA Leave only:

("SPEED", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),

{FLY_MODAL_SPEED, "SPEED", 0, "Speed", ""},

the rest is more logical in 111141 since it fixes the directions.

@ChengduLittleA Leave only: `("SPEED", {"type": 'TRACKPADPAN', "value": 'ANY'}, None),` `{FLY_MODAL_SPEED, "SPEED", 0, "Speed", ""},` the rest is more logical in 111141 since it fixes the directions.

YimingWu commented

2023-08-19 09:57:11 +02:00

Author

Member

@jenkm Got it. Will do :)

@jenkm Got it. Will do :)

YimingWu added 1 commit 2023-08-19 10:21:19 +02:00

dabae75b0d Remove unecessary files

YimingWu commented

2023-08-19 10:22:20 +02:00

Author

Member

Done. The view3d_navigate_fly.cc seems to be a white space change from clang_format.

Done. The `view3d_navigate_fly.cc` seems to be a white space change from `clang_format`.

YimingWu added 1 commit 2023-08-19 10:30:43 +02:00

cdc8290583 include FLY_MODAL_SPEED

Merge conflict checking is in progress. Try again in few moments.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u fix-110848:ChengduLittleA-fix-110848

git checkout ChengduLittleA-fix-110848

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#110930

No description provided.