feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: simplify code

Browse Source 
Change-Id: I3269162c25366b4a9b910ba7431eae6b05b799fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-03-13 15:09:11 +01:00
committed by Thomas Hartmann
parent d98276e06d
commit 3520ba2825
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -283,16 +283,15 @@ void QmlDesignerPlugin::integrateIntoQtCreator(QWidget *modeWidget)
if (d && currentEditor && checkIfEditorIsQtQuick(currentEditor) && if (d && currentEditor && checkIfEditorIsQtQuick(currentEditor) &&
!documentIsAlreadyOpen(currentDesignDocument(), currentEditor, newMode)) { !documentIsAlreadyOpen(currentDesignDocument(), currentEditor, newMode)) {
if (!isDesignerMode(newMode) && isDesignerMode(oldMode)) if (isDesignerMode(newMode)) {
hideDesigner();
else if (currentEditor && isDesignerMode(newMode))
showDesigner(); showDesigner();
else if (currentDesignDocument()) } else if (currentDesignDocument() ||
(!isDesignerMode(newMode) && isDesignerMode(oldMode))) {
hideDesigner(); hideDesigner();
} }
}
}); });
d->viewManager.designerActionManager().polishActions(); d->viewManager.designerActionManager().polishActions();
} }