zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix group move

master
Jeremy Hu 2018-04-12 22:35:50 +08:00
parent 47bb8b5f0b
commit 8773ddd7ef
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/skeletongraphicswidget.cpp
View File

@ -694,25 +694,26 @@ bool SkeletonGraphicsWidget::mousePress(QMouseEvent *event)
} else if (SkeletonDocumentEditMode::Select == m_document->editMode) { } else if (SkeletonDocumentEditMode::Select == m_document->editMode) {
//if (m_mouseEventFromSelf) { //if (m_mouseEventFromSelf) {
bool processed = false; bool processed = false;
//if ((nullptr == m_hoveredNodeItem || m_rangeSelectionSet.find(m_hoveredNodeItem) == m_rangeSelectionSet.end()) && if ((nullptr == m_hoveredNodeItem || m_rangeSelectionSet.find(m_hoveredNodeItem) == m_rangeSelectionSet.end()) &&
// (nullptr == m_hoveredEdgeItem || m_rangeSelectionSet.find(m_hoveredEdgeItem) == m_rangeSelectionSet.end())) { (nullptr == m_hoveredEdgeItem || m_rangeSelectionSet.find(m_hoveredEdgeItem) == m_rangeSelectionSet.end())) {
if (!QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ControlModifier)) { if (!QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ControlModifier)) {
clearRangeSelection(); clearRangeSelection();
} }
if (QGuiApplication::queryKeyboardModifiers().testFlag(Qt::AltModifier)) { if (!QGuiApplication::queryKeyboardModifiers().testFlag(Qt::AltModifier)) {
if (m_hoveredNodeItem) {
removeItemFromRangeSelection(m_hoveredNodeItem);
} else if (m_hoveredEdgeItem) {
removeItemFromRangeSelection(m_hoveredEdgeItem);
}
} else {
if (m_hoveredNodeItem) { if (m_hoveredNodeItem) {
addItemToRangeSelection(m_hoveredNodeItem); addItemToRangeSelection(m_hoveredNodeItem);
} else if (m_hoveredEdgeItem) { } else if (m_hoveredEdgeItem) {
addItemToRangeSelection(m_hoveredEdgeItem); addItemToRangeSelection(m_hoveredEdgeItem);
} }
} }
//} }
if (QGuiApplication::queryKeyboardModifiers().testFlag(Qt::AltModifier)) {
if (m_hoveredNodeItem) {
removeItemFromRangeSelection(m_hoveredNodeItem);
} else if (m_hoveredEdgeItem) {
removeItemFromRangeSelection(m_hoveredEdgeItem);
}
}
if (!m_rangeSelectionSet.empty()) { if (!m_rangeSelectionSet.empty()) {
if (!QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ControlModifier)) { if (!QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ControlModifier)) {
if (!m_moveStarted) { if (!m_moveStarted) {