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

Fixed crash on deleting an item while resize tool is being hovered

Browse Source 
Task-number: BAUHAUS-425
Reviewed-by: marco
This commit is contained in:
Lasse Holmstedt
2010-03-02 16:51:05 +01:00
parent ba6d1e6fad
commit e58ee43ecc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp
View File

@@ -221,7 +221,7 @@ void ResizeController::updatePosition()
FormEditorItem* ResizeController::formEditorItem() const FormEditorItem* ResizeController::formEditorItem() const
{ {
return m_data->formEditorItem; return m_data->formEditorItem.data();
} }
QWeakPointer<ResizeControllerData> ResizeController::weakPointer() const QWeakPointer<ResizeControllerData> ResizeController::weakPointer() const

2
src/plugins/qmldesigner/components/formeditor/resizecontroller.h
View File

@@ -51,7 +51,7 @@ public:
QWeakPointer<LayerItem> layerItem; QWeakPointer<LayerItem> layerItem;
FormEditorItem *formEditorItem; QWeakPointer<FormEditorItem> formEditorItem;
ResizeHandleItem *topLeftItem; ResizeHandleItem *topLeftItem;
ResizeHandleItem *topRightItem; ResizeHandleItem *topRightItem;
ResizeHandleItem *bottomLeftItem; ResizeHandleItem *bottomLeftItem;

4
src/plugins/qmldesigner/components/formeditor/resizetool.cpp
View File

@@ -62,7 +62,7 @@ void ResizeTool::mousePressEvent(const QList<QGraphicsItem*> &itemList,
return; return;
ResizeHandleItem *resizeHandle = ResizeHandleItem::fromGraphicsItem(itemList.first()); ResizeHandleItem *resizeHandle = ResizeHandleItem::fromGraphicsItem(itemList.first());
if (resizeHandle) { if (resizeHandle && resizeHandle->resizeController().isValid()) {
m_resizeManipulator.setHandle(resizeHandle); m_resizeManipulator.setHandle(resizeHandle);
m_resizeManipulator.begin(event->scenePos()); m_resizeManipulator.begin(event->scenePos());
m_resizeIndicator.hide(); m_resizeIndicator.hide();
@@ -92,7 +92,7 @@ void ResizeTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
if (itemList.isEmpty()) if (itemList.isEmpty())
return; return;
ResizeHandleItem* resizeHandle = ResizeHandleItem::fromGraphicsItem(itemList.first()); ResizeHandleItem* resizeHandle = ResizeHandleItem::fromGraphicsItem(itemList.first());
if (resizeHandle) { if (resizeHandle && resizeHandle->resizeController().isValid()) {
m_resizeManipulator.setHandle(resizeHandle); m_resizeManipulator.setHandle(resizeHandle);
} else { } else {
view()->changeToSelectionTool(); view()->changeToSelectionTool();