summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-08-22 14:58:42 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-08-22 15:07:28 +0000
commitf463473764ab9ec3c9014ad632045161f63df04c (patch)
tree988a60c15eea31b5e69628464b53fec93e693912
parentafb6ea539d25ae2e923b0c0188274e42bd272e57 (diff)
Qt Designer: Fix layout alignment context menu entry enabled state
The action remained disabled when triggered a 2nd time after being invoked on a non-laid out widget. Fixes: QTBUG-116305 Change-Id: I78badb41fb82a94f9e5ee3d8f7a99f9127c90bc7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 3ee45500e316d74c2dbb09b3e450456c2d9b2789) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/designer/src/lib/shared/qdesigner_taskmenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
index 9b34135e5..80cb31577 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
@@ -185,8 +185,8 @@ bool LayoutAlignmentMenu::setAlignment(const QDesignerFormEditorInterface *core,
{
bool enabled;
const Qt::Alignment alignment = LayoutAlignmentCommand::alignmentOf(core, w, &enabled);
+ m_subMenuAction->setEnabled(enabled);
if (!enabled) {
- m_subMenuAction->setEnabled(false);
m_actions[HorizNone]->setChecked(true);
m_actions[VerticalNone]->setChecked(true);
return false;