LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix #11756: It is always necessary to select the object that the user clicked on, if it is not currently selected

Browse source
This commit is contained in:
Roman Pudashkin 2022-06-03 15:30:02 +02:00
parent 006adbe056
commit 91fb925bf8
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/notation/view/notationviewinputcontroller.cpp
View file

@ -542,10 +542,8 @@ bool NotationViewInputController::needSelect(const ClickContext& ctx) const
return false;
}
bool hitElementSelected = ctx.hitElement->selected();
if (ctx.event->modifiers() & Qt::ControlModifier) {
return !hitElementSelected;
if (!ctx.hitElement->selected()) {
return true;
}
INotationSelectionPtr selection = viewInteraction()->selection();
@ -554,7 +552,7 @@ bool NotationViewInputController::needSelect(const ClickContext& ctx) const
return !selection->range()->containsPoint(ctx.logicClickPos);
}
return !hitElementSelected;
return false;
}
void NotationViewInputController::handleLeftClick(const ClickContext& ctx)
@ -635,8 +633,9 @@ void NotationViewInputController::mouseMoveEvent(QMouseEvent* event)
}
if (viewInteraction()->isGripEditStarted() && !viewInteraction()->isDragStarted()) {
EngravingItem* selectedElement = viewInteraction()->selection()->element();
startDragElements(selectedElement->type(), selectedElement->offset());
const EngravingItem* selectedElement = viewInteraction()->selection()->element();
ElementType type = selectedElement ? selectedElement->type() : ElementType::INVALID;
startDragElements(type, selectedElement->offset());
}
DragMode mode = DragMode::BothXY;
@ -668,6 +667,10 @@ void NotationViewInputController::mouseMoveEvent(QMouseEvent* event)
void NotationViewInputController::startDragElements(ElementType elementsType, const PointF& elementsOffset)
{
if (elementsType == ElementType::INVALID) {
return;
}
std::vector<EngravingItem*> elements = viewInteraction()->selection()->elements();
if (elements.empty()) {
return;