4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix crop on flipped sceneitems in bounding boxes

Browse source 
Same as previous commits, flipped sceneitems in bounding boxes ought
to be treated as not flipped for the purpose of UI interaction in
order to function correctly.
This commit is contained in:
Penwywern 2023-07-07 06:08:16 +02:00 • committed by Lain
commit 6f885770f8
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
UI/window-basic-preview.cpp
View file

@ -1360,9 +1360,13 @@ void OBSBasicPreview::CropItem(const vec2 &pos)
vec3_transform(&pos3, &pos3, &screenToItem);
obs_sceneitem_crop crop = startCrop;
vec2 scale;
vec2 scale, rawscale;
obs_sceneitem_get_scale(stretchItem, &scale);
obs_sceneitem_get_scale(stretchItem, &rawscale);
vec2_set(&scale,
boundsType == OBS_BOUNDS_NONE ? rawscale.x : fabsf(rawscale.x),
boundsType == OBS_BOUNDS_NONE ? rawscale.y
: fabsf(rawscale.y));
vec2 max_tl;
vec2 max_br;
@ -1374,10 +1378,18 @@ void OBSBasicPreview::CropItem(const vec2 &pos)
typedef std::function<float(float, float)> minmax_func_t;
minmax_func_t min_x = scale.x < 0.0f ? maxfunc : minfunc;
minmax_func_t min_y = scale.y < 0.0f ? maxfunc : minfunc;
minmax_func_t max_x = scale.x < 0.0f ? minfunc : maxfunc;
minmax_func_t max_y = scale.y < 0.0f ? minfunc : maxfunc;
minmax_func_t min_x = scale.x < 0.0f && boundsType == OBS_BOUNDS_NONE
? maxfunc
: minfunc;
minmax_func_t min_y = scale.y < 0.0f && boundsType == OBS_BOUNDS_NONE
? maxfunc
: minfunc;
minmax_func_t max_x = scale.x < 0.0f && boundsType == OBS_BOUNDS_NONE
? minfunc
: maxfunc;
minmax_func_t max_y = scale.y < 0.0f && boundsType == OBS_BOUNDS_NONE
? minfunc
: maxfunc;
pos3.x = min_x(pos3.x, max_br.x);
pos3.x = max_x(pos3.x, max_tl.x);