Commit 66fcbaeb authored by David Thompson's avatar David Thompson Committed by Kitware Robot

Merge topic 'hide-after-save-release' into release

2cbdde2f Provide a way to force the operator panel to hide...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !896
parents f5753c43 2cbdde2f
......@@ -1803,11 +1803,11 @@ void qtModelView::onOperationPanelClosing()
}
}
bool qtModelView::showPreviousOpOrHide()
bool qtModelView::showPreviousOpOrHide(bool alwaysHide)
{
if (this->m_OperatorsWidget)
{
if (this->m_OperatorsWidget->showPreviousOp())
if (this->m_OperatorsWidget->showPreviousOp() && !alwaysHide)
{
return true;
}
......
......@@ -90,7 +90,7 @@ public slots:
bool requestOperation(
const std::string& opName, const smtk::common::UUID& sessionId, bool launchOp);
virtual void onOperationPanelClosing();
virtual bool showPreviousOpOrHide();
virtual bool showPreviousOpOrHide(bool alwaysHide = true);
signals:
void sendSelectionsFromModelViewToSelectionManager(const smtk::model::EntityRefs& selEntities,
......
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