diff options
Diffstat (limited to 'Source')
5 files changed, 28 insertions, 14 deletions
diff --git a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp index 1a8818aa04..56a246955b 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp @@ -47,6 +47,12 @@ AchievementBox::AchievementBox(QWidget* parent, rc_client_achievement_t* achieve m_progress_label->setStyleSheet(QStringLiteral("background-color:transparent;")); m_progress_label->setAlignment(Qt::AlignCenter); + QVBoxLayout* a_col_left = new QVBoxLayout(); + a_col_left->addSpacerItem(new QSpacerItem(0, 0)); + a_col_left->addWidget(m_badge); + a_col_left->addSpacerItem(new QSpacerItem(0, 0)); + a_col_left->setSizeConstraint(QLayout::SetFixedSize); + a_col_left->setAlignment(Qt::AlignCenter); QVBoxLayout* a_col_right = new QVBoxLayout(); a_col_right->addWidget(title); a_col_right->addWidget(description); @@ -57,7 +63,7 @@ AchievementBox::AchievementBox(QWidget* parent, rc_client_achievement_t* achieve a_prog_layout->setContentsMargins(0, 0, 0, 0); a_prog_layout->addWidget(m_progress_label); QHBoxLayout* a_total = new QHBoxLayout(); - a_total->addWidget(m_badge); + a_total->addLayout(a_col_left); a_total->addLayout(a_col_right); setLayout(a_total); diff --git a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp index e7578a31e9..c15afea34f 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp @@ -30,6 +30,7 @@ AchievementLeaderboardWidget::AchievementLeaderboardWidget(QWidget* parent) : QW layout->setContentsMargins(0, 0, 0, 0); layout->setAlignment(Qt::AlignTop); layout->addWidget(m_common_box); + layout->setSizeConstraint(QLayout::SetFixedSize); setLayout(layout); } @@ -50,7 +51,8 @@ void AchievementLeaderboardWidget::UpdateData(bool clean_all) for (u32 bucket = 0; bucket < leaderboard_list->num_buckets; bucket++) { const auto& leaderboard_bucket = leaderboard_list->buckets[bucket]; - m_common_layout->addWidget(new QLabel(tr(leaderboard_bucket.label))); + m_common_layout->addWidget(new QLabel(tr(leaderboard_bucket.label)), row, 0); + row += 2; for (u32 board = 0; board < leaderboard_bucket.num_leaderboards; board++) { const auto* leaderboard = leaderboard_bucket.leaderboards[board]; @@ -64,24 +66,18 @@ void AchievementLeaderboardWidget::UpdateData(bool clean_all) QVBoxLayout* a_col_left = new QVBoxLayout(); a_col_left->addWidget(a_title); a_col_left->addWidget(a_description); - if (row > 0) - { - QFrame* a_divider = new QFrame(); - a_divider->setFrameShape(QFrame::HLine); - m_common_layout->addWidget(a_divider, row - 1, 0); - } + QFrame* a_divider = new QFrame(); + a_divider->setFrameShape(QFrame::HLine); + m_common_layout->addWidget(a_divider, row - 1, 0); m_common_layout->addLayout(a_col_left, row, 0); for (size_t ix = 0; ix < 4; ix++) { QVBoxLayout* a_col = new QVBoxLayout(); for (size_t jx = 0; jx < 3; jx++) a_col->addWidget(new QLabel(QStringLiteral("---"))); - if (row > 0) - { - QFrame* a_divider = new QFrame(); - a_divider->setFrameShape(QFrame::HLine); - m_common_layout->addWidget(a_divider, row - 1, static_cast<int>(ix) + 1); - } + QFrame* a_divider_2 = new QFrame(); + a_divider_2->setFrameShape(QFrame::HLine); + m_common_layout->addWidget(a_divider_2, row - 1, static_cast<int>(ix) + 1); m_common_layout->addLayout(a_col, row, static_cast<int>(ix) + 1); } row += 2; diff --git a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp index 235f37a5d8..9a69cdb66b 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp @@ -33,6 +33,7 @@ AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget( layout->setContentsMargins(0, 0, 0, 0); layout->setAlignment(Qt::AlignTop); layout->addWidget(m_common_box); + layout->setSizeConstraint(QLayout::SetFixedSize); setLayout(layout); } diff --git a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp index 4598e37231..8605c10725 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementsWindow.cpp @@ -7,6 +7,8 @@ #include <mutex> #include <QDialogButtonBox> +#include <QScrollArea> +#include <QScrollBar> #include <QTabWidget> #include <QVBoxLayout> @@ -83,6 +85,8 @@ void AchievementsWindow::UpdateData(AchievementManager::UpdatedItems updated_ite m_header_widget->UpdateData(); m_progress_widget->UpdateData(true); m_leaderboard_widget->UpdateData(true); + static_cast<QScrollArea*>(m_tab_widget->widget(1))->verticalScrollBar()->setValue(0); + static_cast<QScrollArea*>(m_tab_widget->widget(2))->verticalScrollBar()->setValue(0); } else { diff --git a/Source/Core/DolphinQt/Styles/Dark/dark.qss b/Source/Core/DolphinQt/Styles/Dark/dark.qss index cfaf873feb..4ef591c1ee 100644 --- a/Source/Core/DolphinQt/Styles/Dark/dark.qss +++ b/Source/Core/DolphinQt/Styles/Dark/dark.qss @@ -493,3 +493,10 @@ QTableCornerButton::section { border-left: 0px; border-bottom: 0px; } + +QProgressBar { + border: 2px solid grey; + border-radius: 5px; + background-color: #202020; + } +
\ No newline at end of file |