jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-16 20:17:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename subtypeCountLabelStyle to subtypeTallyLabelStyle and fix include ordering

Browse source
This commit is contained in:
DawnFire42 2026-06-09 11:58:49 -04:00
parent 5868db96c9
commit e2ebdc51ad
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -82,8 +82,8 @@ set(cockatrice_SOURCES
src/game_graphics/game_scene.cpp src/game_graphics/game_scene.cpp
src/game/game_state.cpp src/game/game_state.cpp
src/game_graphics/game_view.cpp src/game_graphics/game_view.cpp
src/game/selection_subtype_tally.cpp
src/game_graphics/hand_counter.cpp src/game_graphics/hand_counter.cpp
src/game/selection_subtype_tally.cpp
src/game_graphics/log/message_log_widget.cpp src/game_graphics/log/message_log_widget.cpp
src/game/phase.cpp src/game/phase.cpp
src/game_graphics/phases_toolbar.cpp src/game_graphics/phases_toolbar.cpp

6
cockatrice/src/game_graphics/game_view.cpp
View file

@ -2,7 +2,6 @@
#include "../client/settings/cache_settings.h" #include "../client/settings/cache_settings.h"
#include "game_scene.h" #include "game_scene.h"
#include "libcockatrice/utility/qt_utils.h"
#include "selection_subtype_tally.h" #include "selection_subtype_tally.h"
#include <QAction> #include <QAction>
@ -11,6 +10,7 @@
#include <QLayout> #include <QLayout>
#include <QResizeEvent> #include <QResizeEvent>
#include <QRubberBand> #include <QRubberBand>
#include <libcockatrice/utility/qt_utils.h>
// QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings. // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
// This subclass disables that behavior so dragCountLabel can appear above it. // 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 dragCountLabelStyle = baseProperties + "font-size: 14px; font-weight: bold;";
const QString totalCountLabelStyle = baseProperties + "font-size: 16px; 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 = new QLabel(this);
dragCountLabel->setStyleSheet(dragCountLabelStyle); dragCountLabel->setStyleSheet(dragCountLabelStyle);
@ -78,7 +78,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
totalCountLabel->hide(); totalCountLabel->hide();
subtypeCountContainer = new QWidget(this); subtypeCountContainer = new QWidget(this);
subtypeCountContainer->setStyleSheet(subtypeCountLabelStyle); subtypeCountContainer->setStyleSheet(subtypeTallyLabelStyle);
subtypeCountLayout = new QGridLayout(subtypeCountContainer); subtypeCountLayout = new QGridLayout(subtypeCountContainer);
subtypeCountLayout->setContentsMargins(2, 2, 2, 2); subtypeCountLayout->setContentsMargins(2, 2, 2, 2);
subtypeCountLayout->setSpacing(2); subtypeCountLayout->setSpacing(2);