mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Add ctrl + scroll to zoom scene items

Browse Source
This commit is contained in:
Exeldro 2020-03-17 07:51:29 +01:00
parent 0c41bef84a
commit 7a1ce96f99
2 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
UI/window-basic-preview.cpp
View File

@ -504,6 +504,18 @@ void OBSBasicPreview::wheelEvent(QWheelEvent *event)
SetScalingLevel(scalingLevel - 1);
emit DisplayResized();
}
} else if (QGuiApplication::keyboardModifiers() & Qt::ControlModifier) {
QPoint numPixels = event->pixelDelta();
QPoint numDegrees = event->angleDelta();
float factor = 1.0f;
if (!numPixels.isNull()) {
factor = 1.0f + (0.0008f * numPixels.y());
} else if (!numDegrees.isNull()) {
factor = 1.0f + (0.0008f * numDegrees.y());
}
vec3 pos;
vec3_set(&pos, event->x(), event->y(), factor);
ZoomItems(pos);
}
OBSQTDisplay::wheelEvent(event);
@ -912,6 +924,99 @@ void OBSBasicPreview::MoveItems(const vec2 &pos)
obs_scene_enum_items(scene, move_items, &moveOffset);
}
static bool zoom_items(obs_scene_t *scene, obs_sceneitem_t *item, void *param)
{
if (obs_sceneitem_locked(item))
return true;
vec3 *mouseData = reinterpret_cast<vec3 *>(param);
vec2 mousePos;
vec2_set(&mousePos, mouseData->x, mouseData->y);
bool selected = obs_sceneitem_selected(item);
if (obs_sceneitem_is_group(item) && !selected) {
vec2 itemPos;
obs_sceneitem_get_pos(item, &itemPos);
vec2 size;
if (obs_sceneitem_get_bounds_type(item) == OBS_BOUNDS_NONE) {
auto source = obs_sceneitem_get_source(item);
auto width = obs_source_get_width(source);
auto height = obs_source_get_height(source);
vec2 scale;
obs_sceneitem_get_scale(item, &scale);
vec2_set(&size, width * scale.x, height * scale.y);
} else {
obs_sceneitem_get_bounds(item, &size);
}
auto alignment = obs_sceneitem_get_alignment(item);
if (alignment & OBS_ALIGN_LEFT)
vec2_set(&itemPos, itemPos.x, itemPos.y);
else if (alignment & OBS_ALIGN_RIGHT)
vec2_set(&itemPos, itemPos.x - size.x, itemPos.y);
else
vec2_set(&itemPos, itemPos.x - (size.x / 2.0f),
itemPos.y);
if (alignment & OBS_ALIGN_TOP)
vec2_set(&itemPos, itemPos.x, itemPos.y);
else if (alignment & OBS_ALIGN_BOTTOM)
vec2_set(&itemPos, itemPos.x, itemPos.y - size.y);
else
vec2_set(&itemPos, itemPos.x,
itemPos.y - -(size.y / 2.0f));
vec2 mid;
vec2_sub(&mid, &mousePos, &itemPos);
vec3 newMouseData;
vec3_set(&newMouseData, mid.x, mid.y, mouseData->z);
obs_sceneitem_group_enum_items(item, zoom_items, &newMouseData);
}
if (selected) {
vec2 itemPos;
obs_sceneitem_get_pos(item, &itemPos);
vec2 mid;
vec2_sub(&mid, &itemPos, &mousePos);
vec2 nmid;
vec2_mulf(&nmid, &mid, mouseData->z);
vec2 im;
vec2_sub(&im, &nmid, &mid);
vec2_add(&itemPos, &itemPos, &im);
obs_sceneitem_set_pos(item, &itemPos);
if (obs_sceneitem_get_bounds_type(item) == OBS_BOUNDS_NONE) {
vec2 scale;
obs_sceneitem_get_scale(item, &scale);
vec2_mulf(&scale, &scale, mouseData->z);
obs_sceneitem_set_scale(item, &scale);
} else {
vec2 bounds;
obs_sceneitem_get_bounds(item, &bounds);
vec2_mulf(&bounds, &bounds, mouseData->z);
obs_sceneitem_set_bounds(item, &bounds);
}
}
UNUSED_PARAMETER(scene);
return true;
}
void OBSBasicPreview::ZoomItems(const vec3 &mouseData)
{
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
#ifdef SUPPORTS_FRACTIONAL_SCALING
float pixelRatio = main->devicePixelRatioF();
#else
float pixelRatio = main->devicePixelRatio();
#endif
float scale = pixelRatio / main->previewScale;
vec3 scaledMouseData;
vec3_set(&scaledMouseData,
(mouseData.x - main->previewX / pixelRatio) * scale,
(mouseData.y - main->previewY / pixelRatio) * scale,
mouseData.z);
OBSScene scene = main->GetCurrentScene();
obs_scene_enum_items(scene, zoom_items, &scaledMouseData);
}
static bool CounterClockwise(float x1, float x2, float x3, float y1, float y2,
float y3)
{

1
UI/window-basic-preview.hpp
View File

@ -101,6 +101,7 @@ private:
static void SnapItemMovement(vec2 &offset);
void MoveItems(const vec2 &pos);
void BoxItems(const vec2 &startPos, const vec2 &pos);
void ZoomItems(const vec3 &mouseData);
void ProcessClick(const vec2 &pos);