archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added colored borders to badges in achievements dialog

Browse source 
The achievement badges will now have a blue or gold border to identify whether they have been unlocked in softcore or hardcore mode. Similarly, the game badge will have a blue border if all achievements have been unlocked in either mode or a gold border if all achievements have been unlocked in hardcore mode.
This commit is contained in:
LillyJadeKatrin 2023-07-04 16:17:10 -04:00
parent ba83efded6
commit 80d77cfdad
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/AchievementManager.h
View file

@ -79,6 +79,10 @@ public:
BadgeStatus unlocked_badge; BadgeStatus unlocked_badge;
}; };
static constexpr std::string_view GRAY = "transparent";
static constexpr std::string_view GOLD = "#FFD700";
static constexpr std::string_view BLUE = "#0B71C1";
static AchievementManager* GetInstance(); static AchievementManager* GetInstance();
void Init(); void Init();
void SetUpdateCallback(UpdateCallback callback); void SetUpdateCallback(UpdateCallback callback);

8
Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
View file

@ -119,7 +119,13 @@ void AchievementHeaderWidget::UpdateData()
m_game_icon->setPixmap(QPixmap::fromImage(i_game_icon) m_game_icon->setPixmap(QPixmap::fromImage(i_game_icon)
.scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); .scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
m_game_icon->adjustSize(); m_game_icon->adjustSize();
m_game_icon->setStyleSheet(QStringLiteral("border: 4px solid transparent")); std::string_view color = AchievementManager::GRAY;
if (point_spread.hard_unlocks == point_spread.total_count)
color = AchievementManager::GOLD;
else if (point_spread.hard_unlocks + point_spread.soft_unlocks == point_spread.total_count)
color = AchievementManager::BLUE;
m_game_icon->setStyleSheet(
QStringLiteral("border: 4px solid %1").arg(QString::fromStdString(std::string(color))));
m_game_icon->setVisible(true); m_game_icon->setVisible(true);
} }
} }

9
Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
View file

@ -30,6 +30,8 @@
#include "DolphinQt/QtUtils/SignalBlocking.h" #include "DolphinQt/QtUtils/SignalBlocking.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
static constexpr bool hardcore_mode_enabled = false;
AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget(parent) AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget(parent)
{ {
m_common_box = new QGroupBox(); m_common_box = new QGroupBox();
@ -57,22 +59,27 @@ AchievementProgressWidget::CreateAchievementBox(const rc_api_achievement_definit
QLabel* a_badge = new QLabel(); QLabel* a_badge = new QLabel();
const auto unlock_status = AchievementManager::GetInstance()->GetUnlockStatus(achievement->id); const auto unlock_status = AchievementManager::GetInstance()->GetUnlockStatus(achievement->id);
const AchievementManager::BadgeStatus* badge = &unlock_status.locked_badge; const AchievementManager::BadgeStatus* badge = &unlock_status.locked_badge;
std::string_view color = AchievementManager::GRAY;
if (unlock_status.remote_unlock_status == AchievementManager::UnlockStatus::UnlockType::HARDCORE) if (unlock_status.remote_unlock_status == AchievementManager::UnlockStatus::UnlockType::HARDCORE)
{ {
badge = &unlock_status.unlocked_badge; badge = &unlock_status.unlocked_badge;
color = AchievementManager::GOLD;
} }
else if (hardcore_mode_enabled && unlock_status.session_unlock_count > 1) else if (hardcore_mode_enabled && unlock_status.session_unlock_count > 1)
{ {
badge = &unlock_status.unlocked_badge; badge = &unlock_status.unlocked_badge;
color = AchievementManager::GOLD;
} }
else if (unlock_status.remote_unlock_status == else if (unlock_status.remote_unlock_status ==
AchievementManager::UnlockStatus::UnlockType::SOFTCORE) AchievementManager::UnlockStatus::UnlockType::SOFTCORE)
{ {
badge = &unlock_status.unlocked_badge; badge = &unlock_status.unlocked_badge;
color = AchievementManager::BLUE;
} }
else if (unlock_status.session_unlock_count > 1) else if (unlock_status.session_unlock_count > 1)
{ {
badge = &unlock_status.unlocked_badge; badge = &unlock_status.unlocked_badge;
color = AchievementManager::BLUE;
} }
if (Config::Get(Config::RA_BADGES_ENABLED) && badge->name != "") if (Config::Get(Config::RA_BADGES_ENABLED) && badge->name != "")
{ {
@ -82,6 +89,8 @@ AchievementProgressWidget::CreateAchievementBox(const rc_api_achievement_definit
a_badge->setPixmap(QPixmap::fromImage(i_badge).scaled(64, 64, Qt::KeepAspectRatio, a_badge->setPixmap(QPixmap::fromImage(i_badge).scaled(64, 64, Qt::KeepAspectRatio,
Qt::SmoothTransformation)); Qt::SmoothTransformation));
a_badge->adjustSize(); a_badge->adjustSize();
a_badge->setStyleSheet(
QStringLiteral("border: 4px solid %1").arg(QString::fromStdString(std::string(color))));
} }
} }