From 66092b102cccdfb2bd1ebba0ada15dd5b762555e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 12 Jan 2025 00:56:35 +0100 Subject: [PATCH] Change opacity scaling. --- .../deck_preview_color_identity_widget.cpp | 5 ++--- cockatrice/src/dialogs/dlg_settings.cpp | 3 ++- cockatrice/src/settings/cache_settings.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp index 9748eb4d5..ba12f5441 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview_color_identity_widget.cpp @@ -79,7 +79,8 @@ void DeckPreviewColorCircleWidget::paintEvent(QPaintEvent *event) if (SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities() || isActive) { // Make the circle faint if it is not active if (!isActive) { - circleColor.setAlpha(SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity()); + circleColor.setAlpha(SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity() / 100.0 * + 255.0); } // Draw the circle @@ -100,13 +101,11 @@ void DeckPreviewColorCircleWidget::paintEvent(QPaintEvent *event) painter.setPen(Qt::black); } - // Center the text within the circle painter.drawText(circleRect, Qt::AlignCenter, colorChar); } } - void DeckPreviewColorCircleWidget::setColorActive(bool active) { isActive = active; diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index db326a622..1df9ff164 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -356,7 +356,7 @@ AppearanceSettingsPage::AppearanceSettingsPage() &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities); visualDeckStorageUnusedColorIdentitiesOpacitySpinBox.setMinimum(0); - visualDeckStorageUnusedColorIdentitiesOpacitySpinBox.setMaximum(255); + visualDeckStorageUnusedColorIdentitiesOpacitySpinBox.setMaximum(100); visualDeckStorageUnusedColorIdentitiesOpacitySpinBox.setValue( settings.getVisualDeckStorageUnusedColorIdentitiesOpacity()); connect(&visualDeckStorageUnusedColorIdentitiesOpacitySpinBox, &QSpinBox::valueChanged, &settings, @@ -508,6 +508,7 @@ void AppearanceSettingsPage::retranslateUi() visualDeckStorageDrawUnusedColorIdentitiesCheckBox.setText( tr("Draw missing color identities in visual deck storage without color label")); visualDeckStorageUnusedColorIdentitiesOpacityLabel.setText((tr("Missing color identity opacity"))); + visualDeckStorageUnusedColorIdentitiesOpacitySpinBox.setSuffix("%"); cardsGroupBox->setTitle(tr("Card rendering")); displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture")); diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index 105c50259..d111d2812 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -265,7 +265,7 @@ SettingsCache::SettingsCache() visualDeckStorageDrawUnusedColorIdentities = settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool(); visualDeckStorageUnusedColorIdentitiesOpacity = - settings->value("interface/visualdeckstorageunusedcoloridentitiesopacity", 80).toInt(); + settings->value("interface/visualdeckstorageunusedcoloridentitiesopacity", 30).toInt(); horizontalHand = settings->value("hand/horizontal", true).toBool(); invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool(); minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();