diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index 082ddd5a..64327853 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -597,7 +597,7 @@ Qt::Horizontal - + AdvSceneSwitcher.macroTab.macros diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp index 8a1b42e6..d5aba05b 100644 --- a/lib/macro/macro-tab.cpp +++ b/lib/macro/macro-tab.cpp @@ -670,18 +670,6 @@ void AdvSceneSwitcher::SetupMacroTab() SLOT(HighlightOnChange())); onChangeHighlightTimer.start(); - // Reserve more space for macro edit area than for the macro list - ui->macroListMacroEditSplitter->setStretchFactor(0, 1); - ui->macroListMacroEditSplitter->setStretchFactor(1, 4); - - if (switcher->saveWindowGeo) { - if (shouldRestoreSplitter( - switcher->macroListMacroEditSplitterPosition)) { - ui->macroListMacroEditSplitter->setSizes( - switcher->macroListMacroEditSplitterPosition); - } - } - SetupMacroSearchWidgets(ui->macroSearchLayout, ui->macroSearchText, ui->macroSearchClear, ui->macroSearchType, ui->macroSearchRegex, @@ -705,6 +693,26 @@ void AdvSceneSwitcher::SetupMacroTab() ui->actionTriggerMode->addItem(obs_module_text(name), static_cast(mode)); } + + ui->macroListBox->setSizePolicy(QSizePolicy::Ignored, + QSizePolicy::Preferred); + ui->macroListBox->setMinimumWidth(0); + ui->macroEditGroup->setSizePolicy(QSizePolicy::Ignored, + QSizePolicy::Preferred); + ui->macroEditGroup->setMinimumWidth(0); + + if (shouldRestoreSplitter( + switcher->macroListMacroEditSplitterPosition)) { + ui->macroListMacroEditSplitter->setSizes( + switcher->macroListMacroEditSplitterPosition); + } else { + QTimer::singleShot(0, this, [this]() { + const auto totalWidth = + ui->macroListMacroEditSplitter->width(); + ui->macroListMacroEditSplitter->setSizes( + {totalWidth / 5, totalWidth * 4 / 5}); + }); + } } void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)