mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-22 09:35:08 -07:00
[CI] Remove Qt5 (#7071)
* [CI] Remove Qt5 Took 10 minutes Took 9 minutes * Revert CI failure and fix up comments Took 4 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
59d90db3c7
commit
c4316c40e9
60 changed files with 103 additions and 555 deletions
|
|
@ -147,11 +147,7 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
|
|||
if (event->type() == QEvent::MouseButtonPress) {
|
||||
auto *mouseEvent = static_cast<QMouseEvent *>(event);
|
||||
if (mouseEvent->button() == Qt::LeftButton) {
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
dragStartPos = mouseEvent->globalPosition().toPoint();
|
||||
#else
|
||||
dragStartPos = mouseEvent->globalPos();
|
||||
#endif
|
||||
isDraggingPanel = false;
|
||||
dragButton->setCursor(Qt::ClosedHandCursor);
|
||||
}
|
||||
|
|
@ -159,11 +155,7 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
|
|||
} else if (event->type() == QEvent::MouseMove) {
|
||||
auto *mouseEvent = static_cast<QMouseEvent *>(event);
|
||||
if (mouseEvent->buttons() & Qt::LeftButton) {
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
QPoint currentPos = mouseEvent->globalPosition().toPoint();
|
||||
#else
|
||||
QPoint currentPos = mouseEvent->globalPos();
|
||||
#endif
|
||||
int distance = (currentPos - dragStartPos).manhattanLength();
|
||||
if (distance >= 5 && !isDraggingPanel) {
|
||||
isDraggingPanel = true;
|
||||
|
|
@ -182,22 +174,14 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
|
|||
if (obj == resizeHandle) {
|
||||
if (event->type() == QEvent::MouseButtonPress) {
|
||||
auto *mouseEvent = static_cast<QMouseEvent *>(event);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
resizeStartY = mouseEvent->globalPosition().y();
|
||||
#else
|
||||
resizeStartY = mouseEvent->globalPos().y();
|
||||
#endif
|
||||
isResizing = true;
|
||||
resizeStartHeight = currentHeight;
|
||||
resizeHandle->grabMouse();
|
||||
return true;
|
||||
} else if (event->type() == QEvent::MouseMove && isResizing) {
|
||||
auto *mouseEvent = static_cast<QMouseEvent *>(event);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
int deltaY = mouseEvent->globalPosition().y() - resizeStartY;
|
||||
#else
|
||||
int deltaY = mouseEvent->globalPos().y() - resizeStartY;
|
||||
#endif
|
||||
int newHeight = resizeStartHeight + deltaY;
|
||||
|
||||
int minAllowed = getMinimumAllowedHeight();
|
||||
|
|
@ -221,11 +205,7 @@ void ResizablePanel::dragEnterEvent(QDragEnterEvent *event)
|
|||
{
|
||||
if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
|
||||
event->acceptProposedAction();
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
showDropIndicator(event->position().y());
|
||||
#else
|
||||
showDropIndicator(event->pos().y());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -233,13 +213,8 @@ void ResizablePanel::dragMoveEvent(QDragMoveEvent *event)
|
|||
{
|
||||
if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
|
||||
event->acceptProposedAction();
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
showDropIndicator(event->position().y());
|
||||
lastDragPos = mapToGlobal(event->position().toPoint());
|
||||
#else
|
||||
showDropIndicator(event->pos().y());
|
||||
lastDragPos = mapToGlobal(event->pos());
|
||||
#endif
|
||||
|
||||
if (!autoScrollTimer->isActive()) {
|
||||
autoScrollTimer->start();
|
||||
|
|
@ -265,11 +240,7 @@ void ResizablePanel::dropEvent(QDropEvent *event)
|
|||
ResizablePanel *draggedPanel = reinterpret_cast<ResizablePanel *>(ptr);
|
||||
|
||||
if (draggedPanel && draggedPanel != this) {
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
bool insertBefore = (event->position().y() < height() / 2);
|
||||
#else
|
||||
bool insertBefore = (event->pos().y() < height() / 2);
|
||||
#endif
|
||||
emit dropRequested(draggedPanel, this, insertBefore);
|
||||
event->acceptProposedAction();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue