From add93bf09a6573901a425d0370ae79d5e9a69856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=BCbach=2C=20Lukas?= Date: Tue, 25 Nov 2025 11:03:34 +0100 Subject: [PATCH] Increase font size, qt version guard. --- .../widgets/general/display/color_bar.cpp | 37 ++++++++++++------- .../widgets/general/display/color_bar.h | 8 +++- ...dekt_deck_preview_image_display_widget.cpp | 1 + 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/cockatrice/src/interface/widgets/general/display/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/color_bar.cpp index 62efe6b81..d4729411f 100644 --- a/cockatrice/src/interface/widgets/general/display/color_bar.cpp +++ b/cockatrice/src/interface/widgets/general/display/color_bar.cpp @@ -6,14 +6,14 @@ #include #include -ColorBar::ColorBar(const QMap &colors, QWidget *parent) : QWidget(parent), m_colors(colors) +ColorBar::ColorBar(const QMap &_colors, QWidget *parent) : QWidget(parent), colors(_colors) { setMouseTracking(true); } -void ColorBar::setColors(const QMap &colors) +void ColorBar::setColors(const QMap &_colors) { - m_colors = colors; + colors = _colors; update(); } @@ -27,11 +27,11 @@ QSize ColorBar::minimumSizeHint() const //------------------------------------------- void ColorBar::paintEvent(QPaintEvent *) { - if (m_colors.isEmpty()) + if (colors.isEmpty()) return; int total = 0; - for (int v : m_colors.values()) + for (int v : colors.values()) total += v; // Prevent divide-by-zero @@ -55,12 +55,12 @@ void ColorBar::paintEvent(QPaintEvent *) p.setClipRect(bounds.adjusted(2, 2, -2, -2)); // Sort colors by key (this ensures a predictable order) - QList sortedKeys = m_colors.keys(); + QList sortedKeys = colors.keys(); std::sort(sortedKeys.begin(), sortedKeys.end()); // Sort alphabetically // Draw each color segment in the sorted order for (const QString &key : sortedKeys) { - int value = m_colors[key]; + int value = colors[key]; double ratio = double(value) / total; int segmentWidth = int(ratio * w); @@ -84,19 +84,28 @@ void ColorBar::paintEvent(QPaintEvent *) //------------------------------------------- // Hover + Tooltips //------------------------------------------- -void ColorBar::enterEvent(QEnterEvent *) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +void ColorBar::enterEvent(QEnterEvent *event) { - m_hover = true; + Q_UNUSED(event); + isHovered = true; } +#else +void ColorBar::enterEvent(QEvent *event) +{ + Q_UNUSED(event); + isHovered = true; +} +#endif void ColorBar::leaveEvent(QEvent *) { - m_hover = false; + isHovered = false; } void ColorBar::mouseMoveEvent(QMouseEvent *event) { - if (!m_hover || m_colors.isEmpty()) + if (!isHovered || colors.isEmpty()) return; QString text = tooltipForPosition(event->position().x()); @@ -107,11 +116,11 @@ void ColorBar::mouseMoveEvent(QMouseEvent *event) QString ColorBar::tooltipForPosition(int x) const { int total = 0; - for (int v : m_colors.values()) + for (int v : colors.values()) total += v; int pos = 0; - for (auto it = m_colors.begin(); it != m_colors.end(); ++it) { + for (auto it = colors.begin(); it != colors.end(); ++it) { double ratio = double(it.value()) / total; int segmentWidth = int(ratio * width()); @@ -127,7 +136,7 @@ QString ColorBar::tooltipForPosition(int x) const } //------------------------------------------- -// Color name mapping (expandable) +// Color name mapping //------------------------------------------- QColor ColorBar::colorFromName(const QString &name) const { diff --git a/cockatrice/src/interface/widgets/general/display/color_bar.h b/cockatrice/src/interface/widgets/general/display/color_bar.h index bdb7eb4d4..a7a97bb92 100644 --- a/cockatrice/src/interface/widgets/general/display/color_bar.h +++ b/cockatrice/src/interface/widgets/general/display/color_bar.h @@ -22,13 +22,17 @@ public: protected: void paintEvent(QPaintEvent *event) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) void enterEvent(QEnterEvent *event) override; +#else + void enterEvent(QEvent *event) override; +#endif void leaveEvent(QEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; private: - QMap m_colors; - bool m_hover = false; + QMap colors; + bool isHovered = false; QColor colorFromName(const QString &name) const; QString tooltipForPosition(int x) const; diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp index 4e9d344c5..f74ecac20 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp @@ -15,6 +15,7 @@ ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(Q QFont f; f.setBold(true); + f.setPointSize(16); topLeftLabel->setFont(f); topRightLabel->setFont(f); bottomLeftLabel->setFont(f);