Skip to content

Qt: add horizontal scrollbar to changelog #19374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Megamouse merged 1 commit into from
Sep 1, 2026
+10 −3
Merged

Qt: add horizontal scrollbar to changelog #19374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions rpcs3/rpcs3qt/update_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <QJsonObject>
#include <QJsonDocument>
#include <QTextBrowser>
#include <QScrollBar>

#if defined(_WIN32) || defined(__APPLE__)
#include <7z.h>
Expand Down Expand Up @@ -432,7 +433,6 @@ void update_manager::update(bool auto_accept, bool is_first_call)
changelog_browser->setReadOnly(true);
changelog_browser->setFrameShape(QFrame::NoFrame);
changelog_browser->setLineWrapMode(QTextBrowser::NoWrap);
changelog_browser->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
changelog_browser->setHtml(QStringLiteral("<h3>%0</h3>%1").arg(tr("Changelog:"), changelog_html));

// Natural height for ≤6 entries, capped at 6-entry height for more
Expand All @@ -449,7 +449,6 @@ void update_manager::update(bool auto_accept, bool is_first_call)
browser_height = static_cast<int>(changelog_browser->document()->size().height());
}

changelog_browser->setFixedHeight(browser_height);
changelog_browser->setVisible(false);

const QString show_text = tr("Show Changelog");
Expand All @@ -459,10 +458,18 @@ void update_manager::update(bool auto_accept, bool is_first_call)
grid->addWidget(toggle_btn, row++, 0, 1, cols);
grid->addWidget(changelog_browser, row++, 0, 1, cols);

QObject::connect(toggle_btn, &QPushButton::clicked, [changelog_browser, toggle_btn, &mb, show_text, hide_text]()
QObject::connect(toggle_btn, &QPushButton::clicked, [changelog_browser, toggle_btn, &mb, show_text, hide_text, browser_height]() mutable
{
const bool becoming_visible = !changelog_browser->isVisible();
changelog_browser->setVisible(becoming_visible);

// Adjust height for horizontal scrollbar
if (changelog_browser->isVisible() && changelog_browser->horizontalScrollBar() && changelog_browser->horizontalScrollBar()->isVisible())
{
browser_height += changelog_browser->horizontalScrollBar()->sizeHint().height();
}

changelog_browser->setFixedHeight(browser_height);
toggle_btn->setText(becoming_visible ? hide_text : show_text);
mb.adjustSize();
});
Expand Down
Loading