OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Refactor / Clean up addNudge

Browse source
This commit is contained in:
gxalpha 2023-02-12 22:48:44 +01:00 committed by Ryan Foster
parent e9504326f9
commit 9afc3cabca
2 changed files with 14 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
UI/window-basic-main.cpp
View file

@ -394,22 +394,26 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->actionE_xit->setShortcut(Qt::CTRL | Qt::Key_Q);
#endif
auto addNudge = [this](const QKeySequence &seq, const char *s) {
auto addNudge = [this](const QKeySequence &seq, MoveDir direction,
int distance) {
QAction *nudge = new QAction(ui->preview);
nudge->setShortcut(seq);
nudge->setShortcutContext(Qt::WidgetShortcut);
ui->preview->addAction(nudge);
connect(nudge, SIGNAL(triggered()), this, s);
connect(nudge, &QAction::triggered,
[this, distance, direction]() {
Nudge(distance, direction);
});
};
addNudge(Qt::Key_Up, SLOT(NudgeUp()));
addNudge(Qt::Key_Down, SLOT(NudgeDown()));
addNudge(Qt::Key_Left, SLOT(NudgeLeft()));
addNudge(Qt::Key_Right, SLOT(NudgeRight()));
addNudge(Qt::SHIFT | Qt::Key_Up, SLOT(NudgeUpFar()));
addNudge(Qt::SHIFT | Qt::Key_Down, SLOT(NudgeDownFar()));
addNudge(Qt::SHIFT | Qt::Key_Left, SLOT(NudgeLeftFar()));
addNudge(Qt::SHIFT | Qt::Key_Right, SLOT(NudgeRightFar()));
addNudge(Qt::Key_Up, MoveDir::Up, 1);
addNudge(Qt::Key_Down, MoveDir::Down, 1);
addNudge(Qt::Key_Left, MoveDir::Left, 1);
addNudge(Qt::Key_Right, MoveDir::Right, 1);
addNudge(Qt::SHIFT | Qt::Key_Up, MoveDir::Up, 10);
addNudge(Qt::SHIFT | Qt::Key_Down, MoveDir::Down, 10);
addNudge(Qt::SHIFT | Qt::Key_Left, MoveDir::Left, 10);
addNudge(Qt::SHIFT | Qt::Key_Right, MoveDir::Right, 10);
assignDockToggle(ui->scenesDock, ui->toggleScenes);
assignDockToggle(ui->sourcesDock, ui->toggleSources);
@ -8725,39 +8729,6 @@ void OBSBasic::Nudge(int dist, MoveDir dir)
obs_scene_enum_items(GetCurrentScene(), nudge_callback, &offset);
}
void OBSBasic::NudgeUp()
{
Nudge(1, MoveDir::Up);
}
void OBSBasic::NudgeDown()
{
Nudge(1, MoveDir::Down);
}
void OBSBasic::NudgeLeft()
{
Nudge(1, MoveDir::Left);
}
void OBSBasic::NudgeRight()
{
Nudge(1, MoveDir::Right);
}
void OBSBasic::NudgeUpFar()
{
Nudge(10, MoveDir::Up);
}
void OBSBasic::NudgeDownFar()
{
Nudge(10, MoveDir::Down);
}
void OBSBasic::NudgeLeftFar()
{
Nudge(10, MoveDir::Left);
}
void OBSBasic::NudgeRightFar()
{
Nudge(10, MoveDir::Right);
}
void OBSBasic::DeleteProjector(OBSProjector *projector)
{
for (size_t i = 0; i < projectors.size(); i++) {

9
UI/window-basic-main.hpp
View file

@ -1165,15 +1165,6 @@ private slots:
void EnablePreviewDisplay(bool enable);
void TogglePreview();
void NudgeUp();
void NudgeDown();
void NudgeLeft();
void NudgeRight();
void NudgeUpFar();
void NudgeDownFar();
void NudgeLeftFar();
void NudgeRightFar();
void OpenStudioProgramProjector();
void OpenPreviewProjector();
void OpenSourceProjector();