blender
/
blender
135
425
Fork 608
Code Issues 6.2k Pull Requests 779 Projects 19 Wiki Activity

Fix: Inconsistent input drag color pick in Square HSV input #112064

Open
Guillermo Venegas wants to merge 6 commits from guishe/blender:fix-mouse-drag-edit-square-hsv into main
pull from: guishe/blender:fix-mouse-drag-edit-square-hsv
merge into: blender:main

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

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

@ -6522,19 +6522,25 @@ static bool ui_numedit_but_HSVCUBE(uiBut *but,
float mx_fl, my_fl;
const bool changed = true;
/* Workaround for snapping: stores the relative mouse position within the color inputbox.*/
static float mval[2];
if (use_continuous_grab) {
rcti rect;
BLI_rcti_rctf_copy(&rect, &but->rect);
ui_hsvcube_pos_from_vals(hsv_but, &rect, hsv, &mx_fl, &my_fl);
const float fac = ui_mouse_scale_warp_factor(shift);
mx_fl = (mx - float(data->draglastx)) * fac + mx_fl;
my_fl = (my - float(data->draglasty)) * fac + my_fl;
mval[0] = (mx - float(data->draglastx)) * fac + mval[0];
mval[1] = (my - float(data->draglasty)) * fac + mval[1];
BLI_rctf_clamp_pt_v(&but->rect, mval);
mx_fl = mval[0];
my_fl = mval[1];
}
else {
mx_fl = mx;
my_fl = my;
mval[0] = mx_fl;
mval[1] = my_fl;
}
#ifdef USE_CONT_MOUSE_CORRECT
@ -6551,7 +6557,6 @@ static bool ui_numedit_but_HSVCUBE(uiBut *but,
ui_rgb_to_color_picker_HSVCUBE_compat_v(hsv_but, rgb, hsv);
/* relative position within box */
x = (float(mx_fl) - but->rect.xmin) / BLI_rctf_size_x(&but->rect);
y = (float(my_fl) - but->rect.ymin) / BLI_rctf_size_y(&but->rect);