Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Limit projector action to main canvas and improve layout

Browse Source
This commit is contained in:
WarmUpTill 2025-10-22 20:35:47 +02:00 committed by WarmUpTill
parent b3bf89840b
commit 8f3b868fd9
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils/scene-selection.hpp
View File

@ -46,7 +46,7 @@ public:
bool previous = false, bool current = false,
bool preview = false);
EXPORT void SetScene(const SceneSelection &);
void LockToMainCanvas();
EXPORT void LockToMainCanvas();
protected:
void showEvent(QShowEvent *event) override;

37
plugins/base/macro-action-projector.cpp
View File

@ -250,6 +250,10 @@ MacroActionProjectorEdit::MacroActionProjectorEdit(
_regex(new RegexConfigWidget(this)),
_layout(new QHBoxLayout(this))
{
// The obs_frontend_open_projector() function does not seem to support
// scenes of secondary canvases
_scenes->LockToMainCanvas();
populateActionSelection(_actions);
populateWindowTypes(_windowTypes);
populateSelectionTypes(_types);
@ -396,26 +400,29 @@ void MacroActionProjectorEdit::SetWidgetVisibility()
return;
}
_projectorWindowName->setVisible(_entryData->_action ==
const auto &action = _entryData->_action;
const auto &type = _entryData->_type;
_projectorWindowName->setVisible(action ==
MacroActionProjector::Action::CLOSE);
_regex->setVisible(_entryData->_action ==
MacroActionProjector::Action::CLOSE);
_types->setVisible(_entryData->_action ==
MacroActionProjector::Action::OPEN);
_windowTypes->setVisible(_entryData->_action ==
MacroActionProjector::Action::OPEN);
_scenes->setVisible(
_entryData->_action == MacroActionProjector::Action::OPEN &&
_entryData->_type == MacroActionProjector::Type::SCENE);
_sources->setVisible(
_entryData->_action == MacroActionProjector::Action::OPEN &&
_entryData->_type == MacroActionProjector::Type::SOURCE);
_monitors->setVisible(_entryData->_action ==
MacroActionProjector::Action::OPEN &&
_regex->setVisible(action == MacroActionProjector::Action::CLOSE);
_types->setVisible(action == MacroActionProjector::Action::OPEN);
_windowTypes->setVisible(action == MacroActionProjector::Action::OPEN);
_scenes->setVisible(action == MacroActionProjector::Action::OPEN &&
type == MacroActionProjector::Type::SCENE);
_sources->setVisible(action == MacroActionProjector::Action::OPEN &&
type == MacroActionProjector::Type::SOURCE);
_monitors->setVisible(action == MacroActionProjector::Action::OPEN &&
_entryData->_fullscreen);
adjustSize();
updateGeometry();
if (action == MacroActionProjector::Action::CLOSE) {
RemoveStretchIfPresent(_layout);
} else {
AddStretchIfNecessary(_layout);
}
}
} // namespace advss