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

QmlDesigner: Move currentState to AbstractView

Browse Source 
Change-Id: I3252d85dceff606c85898895e91b7e955441033b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-31 15:22:28 +02:00
parent 0dd5f68152
commit e06f7e1db7
9 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/formeditor/movetool.cpp
View File

@@ -95,8 +95,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
m_resizeIndicator.hide();
FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems);
if (containerItem
&& QmlModelState::isBaseState(view()->currentStateNode())) {
if (containerItem && view()->currentState().isBaseState()) {
if (containerItem != m_movingItems.first()->parentItem()
&& event->modifiers().testFlag(Qt::ShiftModifier)) {
m_moveManipulator.reparentTo(containerItem);