From e2ebdc51addbef87c31441a8952620bbabe1406d Mon Sep 17 00:00:00 2001 From: DawnFire42 Date: Tue, 9 Jun 2026 11:58:49 -0400 Subject: [PATCH] Rename subtypeCountLabelStyle to subtypeTallyLabelStyle and fix include ordering --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/game_graphics/game_view.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 9dfb81f3c..086e189a1 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -82,8 +82,8 @@ set(cockatrice_SOURCES src/game_graphics/game_scene.cpp src/game/game_state.cpp src/game_graphics/game_view.cpp - src/game/selection_subtype_tally.cpp src/game_graphics/hand_counter.cpp + src/game/selection_subtype_tally.cpp src/game_graphics/log/message_log_widget.cpp src/game/phase.cpp src/game_graphics/phases_toolbar.cpp diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp index 4a47b7aed..25392c174 100644 --- a/cockatrice/src/game_graphics/game_view.cpp +++ b/cockatrice/src/game_graphics/game_view.cpp @@ -2,7 +2,6 @@ #include "../client/settings/cache_settings.h" #include "game_scene.h" -#include "libcockatrice/utility/qt_utils.h" #include "selection_subtype_tally.h" #include @@ -11,6 +10,7 @@ #include #include #include +#include // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings. // This subclass disables that behavior so dragCountLabel can appear above it. @@ -66,7 +66,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par const QString dragCountLabelStyle = baseProperties + "font-size: 14px; font-weight: bold;"; const QString totalCountLabelStyle = baseProperties + "font-size: 16px; font-weight: bold;"; - const QString subtypeCountLabelStyle = baseProperties + "font-size: 12px;"; + const QString subtypeTallyLabelStyle = baseProperties + "font-size: 12px;"; dragCountLabel = new QLabel(this); dragCountLabel->setStyleSheet(dragCountLabelStyle); @@ -78,7 +78,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par totalCountLabel->hide(); subtypeCountContainer = new QWidget(this); - subtypeCountContainer->setStyleSheet(subtypeCountLabelStyle); + subtypeCountContainer->setStyleSheet(subtypeTallyLabelStyle); subtypeCountLayout = new QGridLayout(subtypeCountContainer); subtypeCountLayout->setContentsMargins(2, 2, 2, 2); subtypeCountLayout->setSpacing(2);