UI: Add preview scaling options
Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
This commit is contained in:
parent
ee5aecac01
commit
3b616823a1
7 changed files with 230 additions and 9 deletions
|
|
@ -17,6 +17,7 @@
|
|||
OBSBasicPreview::OBSBasicPreview(QWidget *parent, Qt::WindowFlags flags)
|
||||
: OBSQTDisplay(parent, flags)
|
||||
{
|
||||
ResetScrollingOffset();
|
||||
setMouseTracking(true);
|
||||
}
|
||||
|
||||
|
|
@ -377,6 +378,42 @@ void OBSBasicPreview::GetStretchHandleData(const vec2 &pos)
|
|||
}
|
||||
}
|
||||
|
||||
void OBSBasicPreview::keyPressEvent(QKeyEvent *event)
|
||||
{
|
||||
if (locked ||
|
||||
GetScalingMode() == ScalingMode::Window ||
|
||||
event->isAutoRepeat()) {
|
||||
OBSQTDisplay::keyPressEvent(event);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (event->key()) {
|
||||
case Qt::Key_Space:
|
||||
setCursor(Qt::OpenHandCursor);
|
||||
scrollMode = true;
|
||||
break;
|
||||
}
|
||||
|
||||
OBSQTDisplay::keyPressEvent(event);
|
||||
}
|
||||
|
||||
void OBSBasicPreview::keyReleaseEvent(QKeyEvent *event)
|
||||
{
|
||||
if (event->isAutoRepeat()) {
|
||||
OBSQTDisplay::keyReleaseEvent(event);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (event->key()) {
|
||||
case Qt::Key_Space:
|
||||
scrollMode = false;
|
||||
setCursor(Qt::ArrowCursor);
|
||||
break;
|
||||
}
|
||||
|
||||
OBSQTDisplay::keyReleaseEvent(event);
|
||||
}
|
||||
|
||||
void OBSBasicPreview::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
if (locked) {
|
||||
|
|
@ -393,6 +430,13 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *event)
|
|||
|
||||
OBSQTDisplay::mousePressEvent(event);
|
||||
|
||||
if (scrollMode && GetScalingMode() != ScalingMode::Window) {
|
||||
setCursor(Qt::ClosedHandCursor);
|
||||
scrollingFrom.x = event->x();
|
||||
scrollingFrom.y = event->y();
|
||||
return;
|
||||
}
|
||||
|
||||
if (event->button() != Qt::LeftButton &&
|
||||
event->button() != Qt::RightButton)
|
||||
return;
|
||||
|
|
@ -461,6 +505,9 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event)
|
|||
return;
|
||||
}
|
||||
|
||||
if (scrollMode)
|
||||
setCursor(Qt::OpenHandCursor);
|
||||
|
||||
if (mouseDown) {
|
||||
vec2 pos = GetMouseEventPos(event);
|
||||
|
||||
|
|
@ -954,6 +1001,15 @@ void OBSBasicPreview::mouseMoveEvent(QMouseEvent *event)
|
|||
if (locked)
|
||||
return;
|
||||
|
||||
if (scrollMode && event->buttons() == Qt::LeftButton) {
|
||||
scrollingOffset.x += event->x() - scrollingFrom.x;
|
||||
scrollingOffset.y += event->y() - scrollingFrom.y;
|
||||
scrollingFrom.x = event->x();
|
||||
scrollingFrom.y = event->y();
|
||||
emit DisplayResized();
|
||||
return;
|
||||
}
|
||||
|
||||
if (mouseDown) {
|
||||
vec2 pos = GetMouseEventPos(event);
|
||||
|
||||
|
|
@ -1113,3 +1169,8 @@ void OBSBasicPreview::DrawSceneEditing()
|
|||
gs_technique_end_pass(tech);
|
||||
gs_technique_end(tech);
|
||||
}
|
||||
|
||||
void OBSBasicPreview::ResetScrollingOffset()
|
||||
{
|
||||
vec2_zero(&scrollingOffset);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue