0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-01 19:51:30 +03:00

QT_VERSION < 0x060000 -> (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))

page order has been fixed when TOC page is present and some pages are not printable
This commit is contained in:
Alexander Arin
2021-12-16 00:13:39 +03:00
parent 37b929459b
commit c7eec9160d
30 changed files with 360 additions and 108 deletions

View File

@@ -103,9 +103,11 @@ void SizeHandleRect::mousePressEvent(QMouseEvent *e)
return;
m_startSize = m_curSize = m_resizable->size();
#if QT_VERSION < QT_VERSION_CHECK(5,15,3)
m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPos());
if (debugSizeHandle)
qDebug() << "SizeHandleRect::mousePressEvent" << m_startSize << m_startPos << m_curPos;
#else
m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPosition());
#endif
}
@@ -136,7 +138,7 @@ void SizeHandleRect::mouseMoveEvent(QMouseEvent *e)
delta = QSize(0, 0);
break;
}
if (delta != QSize(0, 0))
if (delta != QSizeF(0, 0))
tryResize(delta);
}

View File

@@ -66,8 +66,15 @@ private:
private:
const Direction m_dir;
QPoint m_startPos;
#if QT_VERSION < QT_VERSION_CHECK(5,12,3)
QPoint m_startPos;
QPoint m_curPos;
#else
QPointF m_startPos;
QPointF m_curPos;
// QSizeF m_startSize;
// QSizeF m_curSize;
#endif
QSize m_startSize;
QSize m_curSize;
QWidget *m_resizable;