Skip to content

Commit 78499bc

Browse files
committed
Improve layout spacing for "Recording" action
1 parent 78fa776 commit 78499bc

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

plugins/base/macro-action-recording.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,18 @@ MacroActionRecordEdit::MacroActionRecordEdit(
192192
QWidget::connect(_chapterName, SIGNAL(editingFinished()), this,
193193
SLOT(ChapterNameChanged()));
194194

195-
auto mainLayout = new QHBoxLayout;
195+
_mainLayout = new QHBoxLayout;
196196
PlaceWidgets(
197197
obs_module_text("AdvSceneSwitcher.action.recording.layout"),
198-
mainLayout,
198+
_mainLayout,
199199
{{"{{actions}}", _actions},
200200
{"{{pauseHint}}", _pauseHint},
201201
{"{{splitHint}}", _splitHint},
202202
{"{{recordFolder}}", _recordFolder},
203203
{"{{recordFileFormat}}", _recordFileFormat},
204204
{"{{outputNotActiveHelp}}", _outputNotActiveHelp},
205205
{"{{chapterName}}", _chapterName}});
206-
setLayout(mainLayout);
206+
setLayout(_mainLayout);
207207

208208
_entryData = entryData;
209209
UpdateEntryData();
@@ -260,6 +260,15 @@ void MacroActionRecordEdit::SetWidgetVisibility()
260260
_entryData->_action == MacroActionRecord::Action::FILE_FORMAT);
261261
_chapterName->setVisible(_entryData->_action ==
262262
MacroActionRecord::Action::ADD_CHAPTER);
263+
const bool hasExtraWidget =
264+
_entryData->_action == MacroActionRecord::Action::FOLDER ||
265+
_entryData->_action == MacroActionRecord::Action::FILE_FORMAT ||
266+
_entryData->_action == MacroActionRecord::Action::ADD_CHAPTER;
267+
if (hasExtraWidget) {
268+
RemoveStretchIfPresent(_mainLayout);
269+
} else {
270+
AddStretchIfNecessary(_mainLayout);
271+
}
263272
}
264273

265274
void MacroActionRecordEdit::ActionChanged(int value)

plugins/base/macro-action-recording.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ private slots:
6565
void FormatStringChanged();
6666
void ChapterNameChanged();
6767

68-
protected:
68+
private:
69+
void SetWidgetVisibility();
70+
6971
QComboBox *_actions;
7072
HelpIcon *_pauseHint;
7173
HelpIcon *_splitHint;
@@ -74,11 +76,8 @@ private slots:
7476
HelpIcon *_outputNotActiveHelp;
7577
VariableLineEdit *_chapterName;
7678
std::shared_ptr<MacroActionRecord> _entryData;
77-
78-
private:
79-
void SetWidgetVisibility();
80-
8179
QHBoxLayout *_mainLayout;
80+
8281
bool _loading = true;
8382
};
8483

0 commit comments

Comments
 (0)