kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Rename 'FocusOut' signal to 'TabOrEnterPressed'

Browse Source
This commit is contained in:
PaddleStroke
2024-03-18 10:02:00 +01:00
parent 4ced18c419
commit 3c87ff59ee
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h
View File

@@ -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<SketcherToolDefaultWidget*>(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);

2
src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp
View File

@@ -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;
}
}

6
src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h
View File

@@ -155,9 +155,9 @@ public:
void restoreComboboxPref(int comboboxindex);
template<typename F>
boost::signals2::connection registerParameterFocusOut(F&& fn)
boost::signals2::connection registerParameterTabOrEnterPressed(F&& fn)
{
return signalParameterFocusOut.connect(std::forward<F>(fn));
return signalParameterTabOrEnterPressed.connect(std::forward<F>(fn));
}
template<typename F>
@@ -217,7 +217,7 @@ private:
private:
std::unique_ptr<Ui_SketcherToolDefaultWidget> ui;
boost::signals2::signal<void(int parameterindex)> signalParameterFocusOut;
boost::signals2::signal<void(int parameterindex)> signalParameterTabOrEnterPressed;
boost::signals2::signal<void(int parameterindex, double value)> signalParameterValueChanged;
boost::signals2::signal<void(int checkboxindex, bool value)> signalCheckboxCheckedChanged;
boost::signals2::signal<void(int comboindex, int value)> signalComboboxSelectionChanged;