ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12925 from LillyJadeKatrin/retroachievements-unlocked-progress 

Achievements Progress Bar Tweaks
This commit is contained in:
Admiral H. Curtiss 2024-07-14 04:11:02 +02:00 committed by GitHub
parent ca40eeecff e035db9127
commit f928fe97af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/Achievements/AchievementBox.cpp
View File

@ -117,11 +117,12 @@ void AchievementBox::UpdateProgress()
if (m_achievement->measured_percent > 0.000) if (m_achievement->measured_percent > 0.000)
{ {
m_progress_bar->setRange(0, 100); m_progress_bar->setRange(0, 100);
m_progress_bar->setValue(m_achievement->measured_percent); m_progress_bar->setValue(m_achievement->unlocked ? 100 : m_achievement->measured_percent);
m_progress_bar->setTextVisible(false); m_progress_bar->setTextVisible(false);
m_progress_label->setText( m_progress_label->setText(
QString::fromUtf8(m_achievement->measured_progress, QString::fromUtf8(m_achievement->measured_progress,
qstrnlen(m_achievement->measured_progress, PROGRESS_LENGTH))); qstrnlen(m_achievement->measured_progress, PROGRESS_LENGTH)));
m_progress_label->setVisible(!m_achievement->unlocked);
m_progress_bar->setVisible(true); m_progress_bar->setVisible(true);
} }
else else

19
Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
View File

@ -27,6 +27,7 @@ AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(pare
m_name = new QLabel(); m_name = new QLabel();
m_points = new QLabel(); m_points = new QLabel();
m_game_progress = new QProgressBar(); m_game_progress = new QProgressBar();
m_progress_label = new QLabel();
m_rich_presence = new QLabel(); m_rich_presence = new QLabel();
m_name->setWordWrap(true); m_name->setWordWrap(true);
@ -35,6 +36,9 @@ AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(pare
QSizePolicy sp_retain = m_game_progress->sizePolicy(); QSizePolicy sp_retain = m_game_progress->sizePolicy();
sp_retain.setRetainSizeWhenHidden(true); sp_retain.setRetainSizeWhenHidden(true);
m_game_progress->setSizePolicy(sp_retain); m_game_progress->setSizePolicy(sp_retain);
m_game_progress->setTextVisible(false);
m_progress_label->setStyleSheet(QStringLiteral("background-color:transparent;"));
m_progress_label->setAlignment(Qt::AlignCenter);
QVBoxLayout* icon_col = new QVBoxLayout(); QVBoxLayout* icon_col = new QVBoxLayout();
icon_col->addWidget(m_user_icon); icon_col->addWidget(m_user_icon);
@ -44,6 +48,9 @@ AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(pare
text_col->addWidget(m_points); text_col->addWidget(m_points);
text_col->addWidget(m_game_progress); text_col->addWidget(m_game_progress);
text_col->addWidget(m_rich_presence); text_col->addWidget(m_rich_presence);
QVBoxLayout* prog_layout = new QVBoxLayout(m_game_progress);
prog_layout->setContentsMargins(0, 0, 0, 0);
prog_layout->addWidget(m_progress_label);
QHBoxLayout* header_layout = new QHBoxLayout(); QHBoxLayout* header_layout = new QHBoxLayout();
header_layout->addLayout(icon_col); header_layout->addLayout(icon_col);
header_layout->addLayout(text_col); header_layout->addLayout(text_col);
@ -115,10 +122,15 @@ void AchievementHeaderWidget::UpdateData()
.arg(game_summary.points_unlocked) .arg(game_summary.points_unlocked)
.arg(game_summary.points_core)); .arg(game_summary.points_core));
m_game_progress->setRange(0, game_summary.num_core_achievements); // This ensures that 0/0 renders as empty instead of full
if (!m_game_progress->isVisible()) m_game_progress->setRange(
m_game_progress->setVisible(true); 0, (game_summary.num_core_achievements == 0) ? 1 : game_summary.num_core_achievements);
m_game_progress->setVisible(true);
m_game_progress->setValue(game_summary.num_unlocked_achievements); m_game_progress->setValue(game_summary.num_unlocked_achievements);
m_progress_label->setVisible(true);
m_progress_label->setText(tr("%1/%2")
.arg(game_summary.num_unlocked_achievements)
.arg(game_summary.num_core_achievements));
m_rich_presence->setText(QString::fromUtf8(instance.GetRichPresence().data())); m_rich_presence->setText(QString::fromUtf8(instance.GetRichPresence().data()));
m_rich_presence->setVisible(true); m_rich_presence->setVisible(true);
} }
@ -128,6 +140,7 @@ void AchievementHeaderWidget::UpdateData()
m_points->setText(tr("%1 points").arg(instance.GetPlayerScore())); m_points->setText(tr("%1 points").arg(instance.GetPlayerScore()));
m_game_progress->setVisible(false); m_game_progress->setVisible(false);
m_progress_label->setVisible(false);
m_rich_presence->setVisible(false); m_rich_presence->setVisible(false);
} }
} }

1
Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h
View File

@ -25,6 +25,7 @@ private:
QLabel* m_name; QLabel* m_name;
QLabel* m_points; QLabel* m_points;
QProgressBar* m_game_progress; QProgressBar* m_game_progress;
QLabel* m_progress_label;
QLabel* m_rich_presence; QLabel* m_rich_presence;
QGroupBox* m_header_box; QGroupBox* m_header_box;
}; };