From 02c6d0bf4751d406d32fa9dac0e6f8d45975c45b Mon Sep 17 00:00:00 2001 From: Alex Okonechnikov Date: Wed, 31 Dec 2025 05:47:08 -0500 Subject: [PATCH] fix styles --- .../src/game/zones/view_zone_widget.cpp | 127 +++++++++--------- cockatrice/src/game/zones/view_zone_widget.h | 4 +- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index b13dca908..84d74e21c 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -10,20 +10,21 @@ #include "view_zone.h" #include -#include #include #include #include +#include #include #include #include #include #include -namespace { +namespace +{ constexpr qreal kTitleBarHeight = 24.0; constexpr qreal kMinVisibleWidth = 100.0; -} +} // namespace /** * @param _player the player the cards were revealed to. @@ -257,8 +258,8 @@ void ZoneViewWidget::stopWindowDrag() } QPointF ZoneViewWidget::draggedWindowPos(const QPoint &screenPos, - const QPointF &scenePos, - const QPointF &buttonDownScenePos) const + const QPointF &scenePos, + const QPointF &buttonDownScenePos) const { if (dragView && dragView->viewport()) { const QPoint vpStart = dragView->viewport()->mapFromGlobal(dragStartScreenPos); @@ -275,73 +276,73 @@ bool ZoneViewWidget::windowFrameEvent(QEvent *event) { // Intercept and move the widget in a stable coordinate space switch (event->type()) { - case QEvent::UngrabMouse: - stopWindowDrag(); - break; - case QEvent::GraphicsSceneMousePress: { - auto *me = static_cast(event); - const Qt::WindowFrameSection section = windowFrameSectionAt(me->pos()); - if (me->button() == Qt::LeftButton && section == Qt::TitleBarArea) { - // avoid drag on close button - const QRectF frameRectF = windowFrameRect(); - const QRectF closeRect(frameRectF.right() - kTitleBarHeight, frameRectF.top(), kTitleBarHeight, - kTitleBarHeight); - if (closeRect.contains(me->pos())) { + case QEvent::UngrabMouse: + stopWindowDrag(); + break; + case QEvent::GraphicsSceneMousePress: { + auto *me = static_cast(event); + const Qt::WindowFrameSection section = windowFrameSectionAt(me->pos()); + if (me->button() == Qt::LeftButton && section == Qt::TitleBarArea) { + // avoid drag on close button + const QRectF frameRectF = windowFrameRect(); + const QRectF closeRect(frameRectF.right() - kTitleBarHeight, frameRectF.top(), kTitleBarHeight, + kTitleBarHeight); + if (closeRect.contains(me->pos())) { + me->accept(); + close(); + return true; + } + + draggingWindow = true; + dragStartItemPos = pos(); + dragStartScreenPos = me->screenPos(); + + dragView = nullptr; + if (me->widget()) { + QWidget *current = me->widget(); + while (current && !dragView) { + dragView = qobject_cast(current); + current = current->parentWidget(); + } + } + if (!dragView && scene() && !scene()->views().isEmpty()) { + dragView = scene()->views().constFirst(); + } + + // need to grab mouse to receive events and not miss initial movement + grabMouse(); + me->accept(); - close(); return true; } - - draggingWindow = true; - dragStartItemPos = pos(); - dragStartScreenPos = me->screenPos(); - - dragView = nullptr; - if (me->widget()) { - QWidget *current = me->widget(); - while (current && !dragView) { - dragView = qobject_cast(current); - current = current->parentWidget(); - } - } - if (!dragView && scene() && !scene()->views().isEmpty()) { - dragView = scene()->views().constFirst(); - } - - // need to grab mouse to receive events and not miss initial movement - grabMouse(); - - me->accept(); - return true; + break; } - break; - } - case QEvent::GraphicsSceneMouseMove: { - auto *me = static_cast(event); - if (draggingWindow) { - if (!(me->buttons() & Qt::LeftButton)) { + case QEvent::GraphicsSceneMouseMove: { + auto *me = static_cast(event); + if (draggingWindow) { + if (!(me->buttons() & Qt::LeftButton)) { + stopWindowDrag(); + me->accept(); + return true; + } + + setPos(draggedWindowPos(me->screenPos(), me->scenePos(), me->buttonDownScenePos(Qt::LeftButton))); + me->accept(); + return true; + } + break; + } + case QEvent::GraphicsSceneMouseRelease: { + auto *me = static_cast(event); + if (draggingWindow && me->button() == Qt::LeftButton) { stopWindowDrag(); me->accept(); return true; } - - setPos(draggedWindowPos(me->screenPos(), me->scenePos(), me->buttonDownScenePos(Qt::LeftButton))); - me->accept(); - return true; + break; } - break; - } - case QEvent::GraphicsSceneMouseRelease: { - auto *me = static_cast(event); - if (draggingWindow && me->button() == Qt::LeftButton) { - stopWindowDrag(); - me->accept(); - return true; - } - break; - } - default: - break; + default: + break; } return QGraphicsWidget::windowFrameEvent(event); diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h index a0026195b..07bd122c4 100644 --- a/cockatrice/src/game/zones/view_zone_widget.h +++ b/cockatrice/src/game/zones/view_zone_widget.h @@ -74,9 +74,7 @@ private: QPointer dragView; void stopWindowDrag(); - QPointF draggedWindowPos(const QPoint &screenPos, - const QPointF &scenePos, - const QPointF &buttonDownScenePos) const; + QPointF draggedWindowPos(const QPoint &screenPos, const QPointF &scenePos, const QPointF &buttonDownScenePos) const; void resizeScrollbar(qreal newZoneHeight); signals: