Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-10-26 02:19:47 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Place frame buttons next to current cursor position
Some checks are pending
debian-build / build (push) Waiting to run
Details
Check locale / ubuntu64 (push) Waiting to run
Details
Push to master / Check Formatting 🔍 (push) Waiting to run
Details
Push to master / Build Project 🧱 (push) Waiting to run
Details
Push to master / Create Release 🛫 (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
WarmUpTill
2026-10-25 12:45:07 +01:00
committed by WarmUpTill
parent 10f1cc154f
commit 1e5b0a7b68
9 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/base/macro-condition-cursor.cpp
View File

@@ -197,7 +197,7 @@ MacroConditionCursorEdit::MacroConditionCursorEdit(
connect(_drawFrame, &QPushButton::clicked, this,
&MacroConditionCursorEdit::DrawFrame, Qt::QueuedConnection);
std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
const std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
{"{{conditions}}", _conditions},
{"{{buttons}}", _buttons},
{"{{minX}}", _minX},
@@ -207,16 +207,16 @@ MacroConditionCursorEdit::MacroConditionCursorEdit(
{"{{xPos}}", _xPos},
{"{{yPos}}", _yPos},
{"{{toggleFrameButton}}", _frameToggle},
{"{{drawFrameButton}}", _drawFrame},
};
QHBoxLayout *line1 = new QHBoxLayout;
auto line1 = new QHBoxLayout;
PlaceWidgets(obs_module_text(
"AdvSceneSwitcher.condition.cursor.entry.line1"),
"AdvSceneSwitcher.condition.cursor.layout.line1"),
line1, widgetPlaceholders);
PlaceWidgets(obs_module_text(
"AdvSceneSwitcher.condition.cursor.entry.line2"),
"AdvSceneSwitcher.condition.cursor.layout.line2"),
_curentPosLayout, widgetPlaceholders);
_curentPosLayout->addWidget(_drawFrame);
QVBoxLayout *mainLayout = new QVBoxLayout;
auto mainLayout = new QVBoxLayout;
mainLayout->addLayout(line1);
mainLayout->addLayout(_curentPosLayout);
setLayout(mainLayout);
@@ -345,8 +345,6 @@ void MacroConditionCursorEdit::SetWidgetVisibility()
_minY->setVisible(isRegionCondition);
_maxX->setVisible(isRegionCondition);
_maxY->setVisible(isRegionCondition);
_frameToggle->setVisible(isRegionCondition);
_drawFrame->setVisible(isRegionCondition);
SetLayoutVisible(_curentPosLayout, isRegionCondition);
if (_frame.isVisible()) {
ToggleFrame();