diff options
Diffstat (limited to 'multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp')
| -rw-r--r-- | multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp index e9babfb98983..f2f46d4cd4e6 100644 --- a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp +++ b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp @@ -1,6 +1,6 @@ ---- UI/window-basic-preview.cpp.orig 2017-10-25 18:45:20 UTC +--- UI/window-basic-preview.cpp.orig 2019-09-17 21:29:34 UTC +++ UI/window-basic-preview.cpp -@@ -471,8 +471,8 @@ void OBSBasicPreview::mousePressEvent(QM +@@ -572,8 +572,8 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *eve GetStretchHandleData(startPos); vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio); @@ -11,7 +11,7 @@ mouseOverItems = SelectedAtPos(startPos); vec2_zero(&lastMoveOffset); -@@ -789,8 +789,8 @@ void OBSBasicPreview::ClampAspect(vec3 & +@@ -1159,8 +1159,8 @@ void OBSBasicPreview::ClampAspect(vec3 &tl, vec3 &br, size.y = size.x / baseAspect * -1.0f; } @@ -22,32 +22,7 @@ if (stretchFlags & ITEM_LEFT) tl.x = br.x - size.x; -@@ -936,18 +936,18 @@ void OBSBasicPreview::CropItem(const vec - crop = startCrop; - - if (stretchFlags & ITEM_LEFT) -- crop.left += int(std::round(tl.x / scale.x)); -+ crop.left += int(::round(tl.x / scale.x)); - else if (stretchFlags & ITEM_RIGHT) -- crop.right += int(std::round((stretchItemSize.x - br.x) / scale.x)); -+ crop.right += int(::round((stretchItemSize.x - br.x) / scale.x)); - - if (stretchFlags & ITEM_TOP) -- crop.top += int(std::round(tl.y / scale.y)); -+ crop.top += int(::round(tl.y / scale.y)); - else if (stretchFlags & ITEM_BOTTOM) -- crop.bottom += int(std::round((stretchItemSize.y - br.y) / scale.y)); -+ crop.bottom += int(::round((stretchItemSize.y - br.y) / scale.y)); - - vec3_transform(&newPos, &newPos, &itemToScreen); -- newPos.x = std::round(newPos.x); -- newPos.y = std::round(newPos.y); -+ newPos.x = ::round(newPos.x); -+ newPos.y = ::round(newPos.y); - - #if 0 - vec3 curPos; -@@ -1032,7 +1032,7 @@ void OBSBasicPreview::StretchItem(const +@@ -1401,7 +1401,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos) vec3_transform(&pos3, &pos3, &itemToScreen); vec2 newPos; @@ -56,7 +31,7 @@ obs_sceneitem_set_pos(stretchItem, &newPos); } -@@ -1059,8 +1059,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo +@@ -1428,8 +1428,8 @@ void OBSBasicPreview::mouseMoveEvent(QMouseEvent *even mouseOverItems = SelectedAtPos(startPos); } @@ -66,4 +41,4 @@ + pos.y = ::round(pos.y); if (stretchHandle != ItemHandle::None) { - if (cropping) + selectionBox = false; |