From 78499bcf5fa2b214afb04532832d039b98bd7d0f Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Sun, 28 Jun 2026 22:27:56 +0200 Subject: [PATCH] Improve layout spacing for "Recording" action --- plugins/base/macro-action-recording.cpp | 15 ++++++++++++--- plugins/base/macro-action-recording.hpp | 9 ++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/plugins/base/macro-action-recording.cpp b/plugins/base/macro-action-recording.cpp index 93862529..42999355 100644 --- a/plugins/base/macro-action-recording.cpp +++ b/plugins/base/macro-action-recording.cpp @@ -192,10 +192,10 @@ MacroActionRecordEdit::MacroActionRecordEdit( QWidget::connect(_chapterName, SIGNAL(editingFinished()), this, SLOT(ChapterNameChanged())); - auto mainLayout = new QHBoxLayout; + _mainLayout = new QHBoxLayout; PlaceWidgets( obs_module_text("AdvSceneSwitcher.action.recording.layout"), - mainLayout, + _mainLayout, {{"{{actions}}", _actions}, {"{{pauseHint}}", _pauseHint}, {"{{splitHint}}", _splitHint}, @@ -203,7 +203,7 @@ MacroActionRecordEdit::MacroActionRecordEdit( {"{{recordFileFormat}}", _recordFileFormat}, {"{{outputNotActiveHelp}}", _outputNotActiveHelp}, {"{{chapterName}}", _chapterName}}); - setLayout(mainLayout); + setLayout(_mainLayout); _entryData = entryData; UpdateEntryData(); @@ -260,6 +260,15 @@ void MacroActionRecordEdit::SetWidgetVisibility() _entryData->_action == MacroActionRecord::Action::FILE_FORMAT); _chapterName->setVisible(_entryData->_action == MacroActionRecord::Action::ADD_CHAPTER); + const bool hasExtraWidget = + _entryData->_action == MacroActionRecord::Action::FOLDER || + _entryData->_action == MacroActionRecord::Action::FILE_FORMAT || + _entryData->_action == MacroActionRecord::Action::ADD_CHAPTER; + if (hasExtraWidget) { + RemoveStretchIfPresent(_mainLayout); + } else { + AddStretchIfNecessary(_mainLayout); + } } void MacroActionRecordEdit::ActionChanged(int value) diff --git a/plugins/base/macro-action-recording.hpp b/plugins/base/macro-action-recording.hpp index f0f4579b..68833bdf 100644 --- a/plugins/base/macro-action-recording.hpp +++ b/plugins/base/macro-action-recording.hpp @@ -65,7 +65,9 @@ private slots: void FormatStringChanged(); void ChapterNameChanged(); -protected: +private: + void SetWidgetVisibility(); + QComboBox *_actions; HelpIcon *_pauseHint; HelpIcon *_splitHint; @@ -74,11 +76,8 @@ protected: HelpIcon *_outputNotActiveHelp; VariableLineEdit *_chapterName; std::shared_ptr _entryData; - -private: - void SetWidgetVisibility(); - QHBoxLayout *_mainLayout; + bool _loading = true; };