From 35274863c95951efcccf540401d692bd3c9560c9 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Tue, 28 Nov 2023 23:55:48 +0100 Subject: [PATCH] Use available layout stretch space for settings input field --- src/macro-core/macro-action-filter.cpp | 15 ++++++++++----- src/macro-core/macro-action-source.cpp | 16 +++++++++++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/macro-core/macro-action-filter.cpp b/src/macro-core/macro-action-filter.cpp index a9f5b6e0..378ab167 100644 --- a/src/macro-core/macro-action-filter.cpp +++ b/src/macro-core/macro-action-filter.cpp @@ -424,11 +424,16 @@ void MacroActionFilterEdit::SetWidgetVisibility() _entryData->_settingsInputMethod == MacroActionFilter::SettingsInputMethod:: INDIVIDUAL_TEMPVAR); - _manualSettingValue->setVisible( - _entryData->_action == MacroActionFilter::Action::SETTINGS && - _entryData->_settingsInputMethod == - MacroActionFilter::SettingsInputMethod:: - INDIVIDUAL_MANUAL); + + if (_entryData->_action == MacroActionFilter::Action::SETTINGS && + _entryData->_settingsInputMethod == + MacroActionFilter::SettingsInputMethod::INDIVIDUAL_MANUAL) { + RemoveStretchIfPresent(_settingsLayout); + _manualSettingValue->show(); + } else { + AddStretchIfNecessary(_settingsLayout); + _manualSettingValue->hide(); + } adjustSize(); updateGeometry(); diff --git a/src/macro-core/macro-action-source.cpp b/src/macro-core/macro-action-source.cpp index 8146f283..1e8da058 100644 --- a/src/macro-core/macro-action-source.cpp +++ b/src/macro-core/macro-action-source.cpp @@ -601,11 +601,17 @@ void MacroActionSourceEdit::SetWidgetVisibility() _entryData->_settingsInputMethod == MacroActionSource::SettingsInputMethod:: INDIVIDUAL_TEMPVAR); - _manualSettingValue->setVisible( - _entryData->_action == MacroActionSource::Action::SETTINGS && - _entryData->_settingsInputMethod == - MacroActionSource::SettingsInputMethod:: - INDIVIDUAL_MANUAL); + + if (_entryData->_action == MacroActionSource::Action::SETTINGS && + _entryData->_settingsInputMethod == + MacroActionSource::SettingsInputMethod::INDIVIDUAL_MANUAL) { + RemoveStretchIfPresent(_settingsLayout); + _manualSettingValue->show(); + } else { + AddStretchIfNecessary(_settingsLayout); + _manualSettingValue->hide(); + } + const bool showWarning = _entryData->_action == MacroActionSource::Action::ENABLE || _entryData->_action == MacroActionSource::Action::DISABLE;