Fix #110853: Trackpad: support for 'ui_colorpicker_small_wheel_cb' #110928
|
@ -6286,7 +6286,7 @@ 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 * (event->xy[1] - event->prev_xy[1]);
|
||||
const float fac = 0.005 * WM_event_absolute_delta_y(event) / U.dpi_fac;
|
||||
hsv[2] = clamp_f(hsv[2] + fac, 0.0f, 1.0f);
|
||||
}
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include "BKE_context.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
@ -833,6 +834,9 @@ static int ui_colorpicker_small_wheel_cb(const bContext * /*C*/,
|
|||
else if (event->type == WHEELDOWNMOUSE) {
|
||||
add = -0.05f;
|
||||
}
|
||||
else if (event->type == MOUSEPAN) {
|
||||
add = 0.005f * WM_event_absolute_delta_y(event) / U.dpi_fac;
|
||||
}
|
||||
|
||||
if (add != 0.0f) {
|
||||
LISTBASE_FOREACH (uiBut *, but, &block->buttons) {
|
||||
|
|
Loading…
Reference in New Issue