blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

WM: add preference for wayland to force the scroll direction on Wayland #120563

Closed
Campbell Barton wants to merge 1 commits from ideasman42:pr-wayland-scroll-direction into main
pull from: ideasman42:pr-wayland-scroll-direction
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 1 Files Changed 4 +51 -1
4 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9af5f8f2f - Show all commits

4
scripts/startup/bl_ui/space_userpref.py
View File

@ -1788,6 +1788,10 @@ class USERPREF_PT_input_touchpad(InputPanel, CenterAlignMixIn, Panel):
col = layout.column()
col.prop(inputs, "use_multitouch_gestures")
from _bpy import _ghost_backend
if _ghost_backend() == 'WAYLAND':
col.prop(inputs, "touchpad_scroll_direction", text="Scroll Direction")
class USERPREF_PT_input_tablet(InputPanel, CenterAlignMixIn, Panel):
bl_label = "Tablet"

13
source/blender/makesdna/DNA_userdef_types.h
View File

@ -775,7 +775,12 @@ typedef struct UserDef {
char pref_flag;
char savetime;
char mouse_emulate_3_button_modifier;
char _pad4[1];
/**
* Workaround for WAYLAND (at time of writing compositors don't support this info).
* #eUserpref_TrackpadScrollDir type
* TODO: Remove this once this API is better supported by Wayland compositors, see #107676.
*/
char trackpad_scroll_direction;
/** FILE_MAXDIR length. */
char tempdir[768];
char fontdir[768];
@ -1519,6 +1524,12 @@ typedef enum eUserpref_EmulateMMBMod {
USER_EMU_MMB_MOD_OSKEY = 1,
} eUserpref_EmulateMMBMod;
typedef enum eUserpref_TrackpadScrollDir {
USER_TRACKPAD_SCROLL_DIR_AUTO = 0,
USER_TRACKPAD_SCROLL_DIR_TRADITIONAL = 1,
USER_TRACKPAD_SCROLL_DIR_NATURAL = 2,
} eUserpref_TrackpadScrollDir;
typedef enum eUserpref_DiskCacheCompression {
USER_SEQ_DISK_CACHE_COMPRESSION_NONE = 0,
USER_SEQ_DISK_CACHE_COMPRESSION_LOW = 1,

19
source/blender/makesrna/intern/rna_userdef.cc
View File

@ -6546,6 +6546,25 @@ static void rna_def_userdef_input(BlenderRNA *brna)
prop = RNA_def_property(srna, "invert_zoom_wheel", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "uiflag", USER_WHEELZOOMDIR);
RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction");
static const EnumPropertyItem touchpad_scroll_direction_items[] = {
{USER_TRACKPAD_SCROLL_DIR_AUTO,
"AUTO",
0,
"Automatic",
"Rely on the systems scroll directly (when supported)"},
{USER_TRACKPAD_SCROLL_DIR_TRADITIONAL,
"TRADITIONAL",
0,
"Traditional",
"Traditional scroll direction"},
{USER_TRACKPAD_SCROLL_DIR_NATURAL, "NATURAL", 0, "Natural", "Natural scroll direction"},
{0, nullptr, 0, nullptr, nullptr},
};
prop = RNA_def_property(srna, "touchpad_scroll_direction", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, nullptr, "trackpad_scroll_direction");
RNA_def_property_enum_items(prop, touchpad_scroll_direction_items);
RNA_def_property_ui_text(prop, "Touchpad Scroll Direction", "Scroll direction (Wayland only)");
}
static void rna_def_userdef_keymap(BlenderRNA *brna)

16
source/blender/windowmanager/intern/wm_event_system.cc
View File

@ -5632,6 +5632,22 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
event.flag |= WM_EVENT_SCROLL_INVERT;
}
#if !defined(WIN32) && !defined(__APPLE__)
switch (eUserpref_TrackpadScrollDir(U.trackpad_scroll_direction)) {
case USER_TRACKPAD_SCROLL_DIR_TRADITIONAL: {
event.flag &= ~WM_EVENT_SCROLL_INVERT;
break;
}
case USER_TRACKPAD_SCROLL_DIR_NATURAL: {
event.flag |= WM_EVENT_SCROLL_INVERT;
break;
}
case USER_TRACKPAD_SCROLL_DIR_AUTO: {
break;
}
}
#endif
wm_event_add_trackpad(win, &event, delta[0], delta[1]);
break;
}