From 1ac859f5edb48874d0d8bd743f60693993cbe637 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 22 Jun 2014 23:53:39 -0700 Subject: [PATCH] Do not clamp aspect by default when using bounds If the scene item has a bounding box set up for it, do not make it use aspect ratio clamping by default. Instead, make it so that shift will turn on aspect ratio, and make it also apply to all types of bounding box modes. The only time where aspect ratio clamping should apply by default is when bounds are not in use (i.e. when a source is just created). Some will disagree with me just because that's how photoshop does it, but we're not photoshop, and I feel that the majority of users will have more trouble with it disabled by default than enabled by default. So to sum it up: If bounds inactive, clamp aspect ratio by default, because scene items start out with it inactive, and it directly affects the scale. If bounds active, do not clamp aspect ratio by default, because clamping to aspect ratio doesn't particularly have an effect for mode bounds modes except for "stretch to bounds". --- obs/window-basic-preview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs/window-basic-preview.cpp b/obs/window-basic-preview.cpp index 58183be00..e1d556f0b 100644 --- a/obs/window-basic-preview.cpp +++ b/obs/window-basic-preview.cpp @@ -598,7 +598,7 @@ void OBSBasicPreview::StretchItem(const vec2 &pos) vec2_set(&size,br. x - tl.x, br.y - tl.y); if (boundsType != OBS_BOUNDS_NONE) { - if (boundsType == OBS_BOUNDS_STRETCH && !shiftDown) + if (shiftDown) ClampAspect(tl, br, size, baseSize); if (tl.x > br.x) std::swap(tl.x, br.x);