Page MenuHomeFreeBSD
Differential D25097 Diff 72666 multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp

Changeset View

Standalone View

View Options

multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp

--- UI/window-basic-preview.cpp.orig 2019-09-17 21:29:34 UTC --- UI/window-basic-preview.cpp.orig 2020-04-26 23:47:36 UTC
+++ UI/window-basic-preview.cpp +++ UI/window-basic-preview.cpp
@@ -572,8 +572,8 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *eve @@ -572,8 +572,8 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *eve
GetStretchHandleData(startPos); GetStretchHandleData(startPos);
vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio); vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio);
- startPos.x = std::round(startPos.x); - startPos.x = std::round(startPos.x);
- startPos.y = std::round(startPos.y); - startPos.y = std::round(startPos.y);
+ startPos.x = ::round(startPos.x); + startPos.x = ::round(startPos.x);
+ startPos.y = ::round(startPos.y); + startPos.y = ::round(startPos.y);
mouseOverItems = SelectedAtPos(startPos); mouseOverItems = SelectedAtPos(startPos);
vec2_zero(&lastMoveOffset); vec2_zero(&lastMoveOffset);
@@ -1159,8 +1159,8 @@ void OBSBasicPreview::ClampAspect(vec3 &tl, vec3 &br, @@ -1161,8 +1161,8 @@ void OBSBasicPreview::ClampAspect(vec3 &tl, vec3 &br,
size.y = size.x / baseAspect * -1.0f; size.y = size.x / baseAspect * -1.0f;
} }
- size.x = std::round(size.x); - size.x = std::round(size.x);
- size.y = std::round(size.y); - size.y = std::round(size.y);
+ size.x = ::round(size.x); + size.x = ::round(size.x);
+ size.y = ::round(size.y); + size.y = ::round(size.y);
if (stretchFlags & ITEM_LEFT) if (stretchFlags & ITEM_LEFT)
tl.x = br.x - size.x; tl.x = br.x - size.x;
@@ -1401,7 +1401,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos) @@ -1403,7 +1403,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
vec3_transform(&pos3, &pos3, &itemToScreen); vec3_transform(&pos3, &pos3, &itemToScreen);
vec2 newPos; vec2 newPos;
- vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y)); - vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y));
+ vec2_set(&newPos, ::round(pos3.x), ::round(pos3.y)); + vec2_set(&newPos, ::round(pos3.x), ::round(pos3.y));
obs_sceneitem_set_pos(stretchItem, &newPos); obs_sceneitem_set_pos(stretchItem, &newPos);
} }
@@ -1428,8 +1428,8 @@ void OBSBasicPreview::mouseMoveEvent(QMouseEvent *even @@ -1430,8 +1430,8 @@ void OBSBasicPreview::mouseMoveEvent(QMouseEvent *even
mouseOverItems = SelectedAtPos(startPos); mouseOverItems = SelectedAtPos(startPos);
} }
- pos.x = std::round(pos.x); - pos.x = std::round(pos.x);
- pos.y = std::round(pos.y); - pos.y = std::round(pos.y);
+ pos.x = ::round(pos.x); + pos.x = ::round(pos.x);
+ pos.y = ::round(pos.y); + pos.y = ::round(pos.y);
if (stretchHandle != ItemHandle::None) { if (stretchHandle != ItemHandle::None) {
selectionBox = false; selectionBox = false;