mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-13 20:23:04 +02:00
Merge pull request #370 from plc-user/master
some small changes for selective move
This commit is contained in:
commit
e66061fdca
@ -547,7 +547,7 @@ void DynamicElementTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Shift or no parent initiates movement of dynamic text, otherwise movement of parent element
|
// Shift or no parent initiates movement of dynamic text, otherwise movement of parent element
|
||||||
if(event->modifiers() & Qt::ShiftModifier || !m_parent_element)
|
if((event->modifiers() & Qt::ShiftModifier) || !m_parent_element)
|
||||||
{
|
{
|
||||||
m_move_parent = false;
|
m_move_parent = false;
|
||||||
DiagramTextItem::mousePressEvent(event);
|
DiagramTextItem::mousePressEvent(event);
|
||||||
@ -584,8 +584,10 @@ void DynamicElementTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
current_parent_pos = mapToParent(mapFromScene(event->scenePos()));
|
current_parent_pos = mapToParent(mapFromScene(event->scenePos()));
|
||||||
button_down_parent_pos = mapToParent(mapFromScene(event->buttonDownScenePos(Qt::LeftButton)));
|
button_down_parent_pos = mapToParent(mapFromScene(event->buttonDownScenePos(Qt::LeftButton)));
|
||||||
|
|
||||||
QPointF new_pos = m_initial_position + current_parent_pos - button_down_parent_pos;
|
int diffx = qRound(current_parent_pos.x() - button_down_parent_pos.x());
|
||||||
event->modifiers() == Qt::ControlModifier ? setPos(new_pos) : setPos(Diagram::snapToGrid(new_pos));
|
int diffy = qRound(current_parent_pos.y() - button_down_parent_pos.y());
|
||||||
|
QPointF new_pos = m_initial_position + QPointF(diffx, diffy);
|
||||||
|
setPos(new_pos);
|
||||||
|
|
||||||
if(diagram())
|
if(diagram())
|
||||||
diagram()->elementTextsMover().continueMovement(event);
|
diagram()->elementTextsMover().continueMovement(event);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user