From 7459bbb14d780dc679d6afc7b3ed88d471e2be26 Mon Sep 17 00:00:00 2001 From: 0penBrain <48731257+0penBrain@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:45:50 +0200 Subject: [PATCH] [PartDesign] Fix 'Reversed' no more available in Pad 'toFirst/toLast' While useless 'Midplane' was still visible Bug introduced in commit #695abed1, not fixed by commmit #7d9fd5e4 Also fixing some typos --- src/Mod/PartDesign/Gui/TaskPadParameters.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp index 27851ad86a..1a2246bdbb 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp @@ -203,7 +203,8 @@ void TaskPadParameters::updateUI(int index) bool isLengthEditVisible = false; bool isLengthEdit2Visible = false; bool isOffsetEditVisible = false; - bool isMidplateEnabled = false; + bool isMidplaneEnabled = false; + bool isMidplaneVisible = false; bool isReversedEnabled = false; bool isReversedVisible = false; bool isFaceEditEnabled = false; @@ -216,7 +217,8 @@ void TaskPadParameters::updateUI(int index) // Calling setFocus() directly doesn't work because the spin box is not // yet visible. QMetaObject::invokeMethod(ui->lengthEdit, "setFocus", Qt::QueuedConnection); - isMidplateEnabled = !ui->checkBoxReversed->isChecked(); + isMidplaneEnabled = !ui->checkBoxReversed->isChecked(); + isMidplaneVisible = true; // Reverse only makes sense if Midplane is not true isReversedEnabled = !ui->checkBoxMidplane->isChecked(); isReversedVisible = true; @@ -224,6 +226,8 @@ void TaskPadParameters::updateUI(int index) // up to first/last else if (index == 1 || index == 2) { isOffsetEditVisible = true; + isReversedEnabled = true; + isReversedVisible = true; } // up to face else if (index == 3) { @@ -238,7 +242,8 @@ void TaskPadParameters::updateUI(int index) else { isLengthEditVisible = true; isLengthEdit2Visible = true; - isMidplateEnabled = !ui->checkBoxReversed->isChecked(); + isMidplaneEnabled = !ui->checkBoxReversed->isChecked(); + isMidplaneVisible = true; isReversedEnabled = !ui->checkBoxMidplane->isChecked(); isReversedVisible = true; } @@ -252,7 +257,8 @@ void TaskPadParameters::updateUI(int index) ui->offsetEdit->setEnabled( isOffsetEditVisible ); ui->labelOffset->setVisible( isOffsetEditVisible ); - ui->checkBoxMidplane->setEnabled( isMidplateEnabled ); + ui->checkBoxMidplane->setEnabled( isMidplaneEnabled ); + ui->checkBoxMidplane->setVisible( isMidplaneVisible ); ui->checkBoxReversed->setEnabled( isReversedEnabled ); ui->checkBoxReversed->setVisible( isReversedVisible );