blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix #110853: Trackpad: support for 'ui_colorpicker_small_wheel_cb' #110928

Open
YimingWu wants to merge 4 commits from ChengduLittleA/blender:fix-110853 into main
pull from: ChengduLittleA/blender:fix-110853
merge into: blender:main

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

3
source/blender/editors/interface/interface_handlers.cc
View File

@ -6286,7 +6286,8 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but, uiHandleButtonData *data, co
hsv[2] = clamp_f(hsv[2] + 0.05f, 0.0f, 1.0f);
}
else {
const float fac = 0.005 * WM_event_absolute_delta_y(event) / U.dpi_fac;
const float fac = 0.005 * WM_event_absolute_delta_y(event) /
(U.scale_factor / UI_SCALE_FAC);
hsv[2] = clamp_f(hsv[2] + fac, 0.0f, 1.0f);
}

2
source/blender/editors/interface/interface_region_color_picker.cc
View File

@ -835,7 +835,7 @@ static int ui_colorpicker_small_wheel_cb(const bContext * /*C*/,
add = -0.05f;
}
else if (event->type == MOUSEPAN) {
add = 0.005f * WM_event_absolute_delta_y(event) / U.dpi_fac;
add = 0.005f * WM_event_absolute_delta_y(event) / (U.scale_factor / UI_SCALE_FAC);
}
if (add != 0.0f) {