Commit 6df67367 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas
Browse files

Merge branch 'release/2.25.1'

parents a66fc620 4c31b9e5
Pipeline #232839 passed with stage
in 0 seconds
# ChangeLog
## version 2.25.1 - 2021-04-02
- fix emission of inserted signal of dtkWidgetsController
## version 2.25.0 - 2021-02-01
- add dtkWidgetsReferences example
- fix parameter/parameterWidget accessors for dtkWidgetsMenuBar
......
......@@ -25,7 +25,7 @@ project(dtkWidgets)
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 25)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION_PATCH 1)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -136,8 +136,11 @@ void dtkWidgetsLayout::create(const QString& action_name)
if(widget) {
widget->setActionName(action_name);
dtkWidgetsController::instance()->blockSignals(true);
dtkWidgetsController::instance()->insert(widget);
dtkWidgetsController::instance()->blockSignals(false);
d->current->setView(widget);
emit dtkWidgetsController::instance()->inserted(widget);
}
}
......@@ -151,8 +154,11 @@ void dtkWidgetsLayout::create(const QString& action_name, const QString& view_na
if(widget) {
widget->setActionName(action_name);
widget->setObjectName(view_name);
dtkWidgetsController::instance()->blockSignals(true);
dtkWidgetsController::instance()->insert(widget);
dtkWidgetsController::instance()->blockSignals(false);
d->current->setView(widget);
emit dtkWidgetsController::instance()->inserted(widget);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment