diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h index cf4a4e86f6..b9e210e947 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h +++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h @@ -100,7 +100,7 @@ private: using Connection = boost::signals2::connection; - Connection connectionParameterFocusOut; + Connection connectionParameterTabOrEnterPressed; Connection connectionParameterValueChanged; Connection connectionCheckboxCheckedChanged; Connection connectionComboboxSelectionChanged; @@ -128,7 +128,7 @@ public: ~DrawSketchDefaultWidgetController() override { - connectionParameterFocusOut.disconnect(); + connectionParameterTabOrEnterPressed.disconnect(); connectionParameterValueChanged.disconnect(); connectionCheckboxCheckedChanged.disconnect(); connectionComboboxSelectionChanged.disconnect(); @@ -156,7 +156,7 @@ public: ControllerBase::focusAutoPassing = true; } - void parameterFocusOut(int parameterindex) + void parameterTabOrEnterPressed(int parameterindex) { Q_UNUSED(parameterindex); passFocusToNextParameter(); @@ -361,8 +361,10 @@ private: { toolWidget = static_cast(widget); // NOLINT - connectionParameterFocusOut = toolWidget->registerParameterFocusOut( - std::bind(&DrawSketchDefaultWidgetController::parameterFocusOut, this, sp::_1)); + connectionParameterTabOrEnterPressed = toolWidget->registerParameterTabOrEnterPressed( + std::bind(&DrawSketchDefaultWidgetController::parameterTabOrEnterPressed, + this, + sp::_1)); connectionParameterValueChanged = toolWidget->registerParameterValueChanged( std::bind(&DrawSketchDefaultWidgetController::parameterValueChanged, @@ -386,7 +388,8 @@ private: /// Resets the widget void resetDefaultWidget() { - boost::signals2::shared_connection_block parameter_focus_block(connectionParameterFocusOut); + boost::signals2::shared_connection_block parameter_focus_block( + connectionParameterTabOrEnterPressed); boost::signals2::shared_connection_block parameter_block(connectionParameterValueChanged); boost::signals2::shared_connection_block checkbox_block(connectionCheckboxCheckedChanged); boost::signals2::shared_connection_block combobox_block(connectionComboboxSelectionChanged); diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp index 8d8b591b3c..59b17a8958 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp @@ -162,7 +162,7 @@ bool SketcherToolDefaultWidget::eventFilter(QObject* object, QEvent* event) if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Return) { for (int i = 0; i < nParameters; i++) { if (object == getParameterSpinBox(i)) { - signalParameterFocusOut(i); + signalParameterTabOrEnterPressed(i); return true; } } diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h index d73ea08383..4432f4f2c6 100644 --- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h +++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h @@ -155,9 +155,9 @@ public: void restoreComboboxPref(int comboboxindex); template - boost::signals2::connection registerParameterFocusOut(F&& fn) + boost::signals2::connection registerParameterTabOrEnterPressed(F&& fn) { - return signalParameterFocusOut.connect(std::forward(fn)); + return signalParameterTabOrEnterPressed.connect(std::forward(fn)); } template @@ -217,7 +217,7 @@ private: private: std::unique_ptr ui; - boost::signals2::signal signalParameterFocusOut; + boost::signals2::signal signalParameterTabOrEnterPressed; boost::signals2::signal signalParameterValueChanged; boost::signals2::signal signalCheckboxCheckedChanged; boost::signals2::signal signalComboboxSelectionChanged;