From 6b5acb7fa05c6a9507905f0b75f90291d39c4e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= Date: Fri, 21 Mar 2025 19:24:06 +0100 Subject: [PATCH] Get rid of cardCornerRadius property --- .../widgets/cards/card_info_picture_enlarged_widget.cpp | 4 ++-- .../client/ui/widgets/cards/card_info_picture_widget.cpp | 4 ++-- cockatrice/src/game/cards/abstract_card_drag_item.cpp | 2 +- cockatrice/src/game/cards/abstract_card_item.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 2 +- cockatrice/src/game/zones/pile_zone.cpp | 2 +- cockatrice/src/settings/cache_settings.cpp | 8 -------- cockatrice/src/settings/cache_settings.h | 5 ----- 8 files changed, 8 insertions(+), 21 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp index 5acc844ef..775390182 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp @@ -86,8 +86,8 @@ void CardInfoPictureEnlargedWidget::paintEvent(QPaintEvent *event) QPoint topLeft{(width() - scaledSize.width()) / 2, (height() - scaledSize.height()) / 2}; // Define the radius for rounded corners - qreal radius = SettingsCache::instance().getCardCornerRadius() * - scaledSize.width(); // Adjust the radius as needed for rounded corners + // Adjust the radius as needed for rounded corners + qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * scaledSize.width() : 0.; QStylePainter painter(this); // Fill the background with transparent color to ensure rounded corners are rendered properly diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp index 15bed554a..546568a73 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp @@ -191,8 +191,8 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event) QRect targetRect{targetX, targetY, targetW, targetH}; // Compute rounded corner radius - qreal radius = SettingsCache::instance().getCardCornerRadius() * - static_cast(targetRect.width()); // Ensure consistent rounding + // Ensure consistent rounding + qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * static_cast(targetRect.width()) : 0.; // Draw the pixmap with rounded corners QStylePainter painter(this); diff --git a/cockatrice/src/game/cards/abstract_card_drag_item.cpp b/cockatrice/src/game/cards/abstract_card_drag_item.cpp index 0971831b0..0c7acd917 100644 --- a/cockatrice/src/game/cards/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/cards/abstract_card_drag_item.cpp @@ -50,7 +50,7 @@ AbstractCardDragItem::~AbstractCardDragItem() QPainterPath AbstractCardDragItem::shape() const { QPainterPath shape; - qreal cardCornerRadius = SettingsCache::instance().getCardCornerRadius() * CARD_WIDTH; + qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0; shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius); return shape; } diff --git a/cockatrice/src/game/cards/abstract_card_item.cpp b/cockatrice/src/game/cards/abstract_card_item.cpp index f3e9b06db..dc00aae66 100644 --- a/cockatrice/src/game/cards/abstract_card_item.cpp +++ b/cockatrice/src/game/cards/abstract_card_item.cpp @@ -48,7 +48,7 @@ QRectF AbstractCardItem::boundingRect() const QPainterPath AbstractCardItem::shape() const { QPainterPath shape; - qreal cardCornerRadius = SettingsCache::instance().getCardCornerRadius() * CARD_WIDTH; + qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0; shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius); return shape; } diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index f1470a23f..41c6ed45a 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -97,7 +97,7 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti pen.setJoinStyle(Qt::MiterJoin); pen.setColor(originZone == DECK_ZONE_MAIN ? Qt::green : Qt::red); painter->setPen(pen); - qreal cardRadius = SettingsCache::instance().getCardCornerRadius() * (CARD_WIDTH - 3); + qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CARD_WIDTH - 3) : 0.0; painter->drawRoundedRect(QRectF(1.5, 1.5, CARD_WIDTH - 3., CARD_HEIGHT - 3.), cardRadius, cardRadius); painter->restore(); } diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp index bf0f7920e..ba23560c9 100644 --- a/cockatrice/src/game/zones/pile_zone.cpp +++ b/cockatrice/src/game/zones/pile_zone.cpp @@ -38,7 +38,7 @@ QRectF PileZone::boundingRect() const QPainterPath PileZone::shape() const { QPainterPath shape; - qreal cardCornerRadius = SettingsCache::instance().getCardCornerRadius() * CARD_WIDTH; + qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0; shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius); return shape; } diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index 1d9474259..2cc9e7ca5 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -332,14 +332,6 @@ SettingsCache::SettingsCache() rememberGameSettings = settings->value("game/remembergamesettings", true).toBool(); clientID = settings->value("personal/clientid", CLIENT_INFO_NOT_SET).toString(); clientVersion = settings->value("personal/clientversion", CLIENT_INFO_NOT_SET).toString(); - - connect(this, &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCornersChanged) { - if (_roundCardCornersChanged) { - emit cardCornerRadiusChanged(0.05); - } else { - emit cardCornerRadiusChanged(0.); - } - }); } void SettingsCache::setUseTearOffMenus(bool _useTearOffMenus) diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index 1e2aefa84..23eb97bed 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -84,7 +84,6 @@ signals: void downloadSpoilerStatusChanged(); void useTearOffMenusChanged(bool state); void roundCardCornersChanged(bool roundCardCorners); - void cardCornerRadiusChanged(qreal cardCornerRadius); private: QSettings *settings; @@ -735,10 +734,6 @@ public: { return roundCardCorners; } - qreal getCardCornerRadius() const - { - return roundCardCorners ? 0.05 : 0.; - } static SettingsCache &instance(); void resetPaths();