realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Merge pull request #320 from plc-user/master

Browse Source 
Fix: Only scroll diagram-view, when moved text leaves visible area
This commit is contained in:
Laurent Trinques 2024-12-31 16:04:26 +01:00 committed by GitHub
commit 1078496bb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sources/diagramview.cpp
View File

@ -821,19 +821,25 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
{ {
if (qgraphicsitem_cast<Conductor *>(qgi)) if (qgraphicsitem_cast<Conductor *>(qgi))
continue; continue;
if(qgi->parentItem() && qgi->parentItem()->isSelected()) if (qgi->parentItem() && qgi->parentItem()->isSelected())
continue; continue;
qreal x = qgi->pos().x(); qreal x = qgi->pos().x();
qreal y = qgi->pos().y(); qreal y = qgi->pos().y();
qreal bottom = viewed_scene.bottom(); qreal bottom = viewed_scene.bottom();
qreal top = viewed_scene.top(); qreal top = viewed_scene.top();
qreal left = viewed_scene.left(); qreal left = viewed_scene.left();
qreal right = viewed_scene.right(); qreal right = viewed_scene.right();
qreal elmt_top = y + qgi->boundingRect().top(); qreal elmt_top = y + qgi->boundingRect().top();
qreal elmt_bottom = y + qgi->boundingRect().bottom(); qreal elmt_bottom = y + qgi->boundingRect().bottom();
qreal elmt_right = x + qgi->boundingRect().right(); qreal elmt_right = x + qgi->boundingRect().right();
qreal elmt_left = x + qgi->boundingRect().left(); 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_right_of_left_margin = elmt_left>=left;
bool elmt_left_of_right_margin = elmt_right<=right; bool elmt_left_of_right_margin = elmt_right<=right;
@ -841,7 +847,7 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
bool elmt_above_bottom_margin = elmt_bottom<=bottom; bool elmt_above_bottom_margin = elmt_bottom<=bottom;
if (!(elmt_right_of_left_margin && elmt_left_of_right_margin) || if (!(elmt_right_of_left_margin && elmt_left_of_right_margin) ||
!(elmt_below_top_margin && elmt_above_bottom_margin ) ) !(elmt_below_top_margin && elmt_above_bottom_margin ) )
{ {
QScrollBar *h = horizontalScrollBar(); QScrollBar *h = horizontalScrollBar();
QScrollBar *v = verticalScrollBar(); QScrollBar *v = verticalScrollBar();