diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-07-23 12:28:50 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-07-23 12:28:50 -0500 |
| commit | e3bbfbabe74bb525adcf16b784338c4cf4e7507c (patch) | |
| tree | 0cc5c2e0925cca094e48d031e502e7ad321aa41a /src/editorui | |
| parent | b12d27291609d79abe2e0e0817acdf5a1c3e2acb (diff) | |
| download | koopatlas-e3bbfbabe74bb525adcf16b784338c4cf4e7507c.tar.gz koopatlas-e3bbfbabe74bb525adcf16b784338c4cf4e7507c.zip | |
Reverted multi-layer selection changes to only the selected layer and path layers
Diffstat (limited to 'src/editorui')
| -rw-r--r-- | src/editorui/doodads.py | 10 | ||||
| -rw-r--r-- | src/editorui/editormain.py | 22 | ||||
| -rw-r--r-- | src/editorui/objects.py | 10 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/editorui/doodads.py b/src/editorui/doodads.py index 89ccfc7..068c420 100644 --- a/src/editorui/doodads.py +++ b/src/editorui/doodads.py @@ -426,9 +426,9 @@ class KPEditorDoodad(KPEditorItem): def hoverMoveEvent(self, event): - # if self._layerRef() != KP.mapScene.currentLayer: - # self.setCursor(Qt.ArrowCursor) - # return + if self._layerRef() != KP.mapScene.currentLayer: + self.setCursor(Qt.ArrowCursor) + return pos = event.pos() bit = self.resizerPortionAt(pos.x(), pos.y()) @@ -460,8 +460,8 @@ class KPEditorDoodad(KPEditorItem): pos = event.pos() bit = self.resizerPortionAt(pos.x(), pos.y()) - # if self._layerRef() == KP.mapScene.currentLayer and bit: - if bit: + if self._layerRef() == KP.mapScene.currentLayer and bit: + # if bit: event.accept() if (event.modifiers() & Qt.ShiftModifier): diff --git a/src/editorui/editormain.py b/src/editorui/editormain.py index 60a09a5..4b2e686 100644 --- a/src/editorui/editormain.py +++ b/src/editorui/editormain.py @@ -736,19 +736,19 @@ class KPEditorWidget(QtGui.QGraphicsView): def mousePressEvent(self, event): - itemsUnder = self.scene().items(self.mapToScene(event.pos()), Qt.IntersectsItemShape, Qt.AscendingOrder) + # itemsUnder = self.scene().items(self.mapToScene(event.pos()), Qt.IntersectsItemShape, Qt.AscendingOrder) if event.button() == Qt.RightButton: self._tryToPaint(event) event.accept() - elif itemsUnder: - QtGui.QGraphicsView.mousePressEvent(self, event) + # elif itemsUnder: + # QtGui.QGraphicsView.mousePressEvent(self, event) - if len(self.scene().selectedItems()) < 2: - self.scene().clearSelection() - itemsUnder[0].setSelected(True) - itemsUnder[0].grabMouse() + # if len(self.scene().selectedItems()) < 2: + # self.scene().clearSelection() + # itemsUnder[0].setSelected(True) + # itemsUnder[0].grabMouse() else: QtGui.QGraphicsView.mousePressEvent(self, event) @@ -765,10 +765,10 @@ class KPEditorWidget(QtGui.QGraphicsView): def mouseReleaseEvent(self, event): QtGui.QGraphicsView.mouseReleaseEvent(self, event) - try: - self.scene().mouseGrabberItem().ungrabMouse() - except: - pass + # try: + # self.scene().mouseGrabberItem().ungrabMouse() + # except: + # pass self.userClick.emit() diff --git a/src/editorui/objects.py b/src/editorui/objects.py index 71566a6..872e289 100644 --- a/src/editorui/objects.py +++ b/src/editorui/objects.py @@ -51,9 +51,9 @@ class KPEditorObject(KPEditorItem): def hoverMoveEvent(self, event): - # if self._layerRef() != KP.mapScene.currentLayer: - # self.setCursor(Qt.ArrowCursor) - # return + if self._layerRef() != KP.mapScene.currentLayer: + self.setCursor(Qt.ArrowCursor) + return pos = event.pos() bit = self.resizerPortionAt(pos.x(), pos.y()) @@ -75,8 +75,8 @@ class KPEditorObject(KPEditorItem): pos = event.pos() bit = self.resizerPortionAt(pos.x(), pos.y()) - # if self._layerRef() == KP.mapScene.currentLayer and bit: - if bit: + if self._layerRef() == KP.mapScene.currentLayer and bit: + # if bit: event.accept() x, xSide, y, ySide = False, None, False, None |