nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another ChartSpace spanning tile fixup

Browse Source 
.. if a tile moves because it clashes with a spanning tile we need
   to repeat the process in case it clashes with another after it
   has been moved.

.. previously we moved on the first clash, but ignored any others.
This commit is contained in:
Mark Liversedge
2021-08-19 12:54:10 +01:00
parent ba3c0bf34e
commit efba58b509
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/ChartSpace.cpp
View File

@@ -477,9 +477,12 @@ repeat:
int add = 0; //XXX PERFORMANCE ISSSE XXX (state == DRAG) ? (ROWHEIGHT/2) : 0;
// check we don't overlap with any spanning items in earlier columns etc
foreach(QRectF spanner, spanners) {
if (spanner.intersects(QRect(tx,ty,twidth,theight+SPACING)))
ty = spanner.bottomLeft().y() + SPACING;
again:
for(int j=0; j< spanners.count(); j++) {
if (spanners[j].intersects(QRect(tx,ty,twidth,theight+SPACING))) {
ty = spanners[j].bottomLeft().y() + SPACING;
goto again;
}
}
// for setting the scene rectangle - but ignore a ChartSpaceItem if we are dragging it