Merge 3438ba9ab3 into 1078496bb1

Merge pull request #320 from plc-user/master
Fix: Only scroll diagram-view, when moved text leaves visible area
2026-06-25 10:24:11 +02:00 · 2024-12-31 20:59:33 +00:00 · 2024-12-31 16:04:26 +01:00 · 2024-12-31 16:01:47 +01:00 · 2024-12-31 15:52:17 +01:00
1 changed files with 14 additions and 8 deletions
@@ -821,7 +821,7 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
 			{
 				if (qgraphicsitem_cast<Conductor *>(qgi))
 					continue;
-				if(qgi->parentItem() && qgi->parentItem()->isSelected())
+				if (qgi->parentItem() && qgi->parentItem()->isSelected())
 					continue;

 				qreal x = qgi->pos().x();
@@ -834,6 +834,12 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
 				qreal elmt_bottom = y + qgi->boundingRect().bottom();
 				qreal elmt_right  = x + qgi->boundingRect().right();
 				qreal elmt_left   = x + qgi->boundingRect().left();
+				if (qgi->parentItem()) {
+					elmt_top    += qgi->parentItem()->y();
+					elmt_bottom += qgi->parentItem()->y();
+					elmt_right  += qgi->parentItem()->x();
+					elmt_left   += qgi->parentItem()->x();
+				}

 				bool elmt_right_of_left_margin = elmt_left>=left;
 				bool elmt_left_of_right_margin = elmt_right<=right;
Author	SHA1	Message	Date
ChuckNr11	d493c24ecf	Merge `3438ba9ab3` into `1078496bb1`	2024-12-31 20:59:33 +00:00
Laurent Trinques	1078496bb1	Merge pull request #320 from plc-user/master Fix: Only scroll diagram-view, when moved text leaves visible area	2024-12-31 16:04:26 +01:00
plc-user	711353bb58	Fix whitespace	2024-12-31 16:01:47 +01:00
plc-user	dd7955e50e	Fix: Only scroll diagram-view, when moved text leaves visible area	2024-12-31 15:52:17 +01:00