From 408d5f8e43840ca7db0b1c6e7dc8ae3526676345 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Wed, 15 Jan 2025 19:46:26 -0800 Subject: [PATCH] implement scroll --- cockatrice/src/dialogs/dlg_settings.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index c9572f3c4..27986c601 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include @@ -1454,6 +1456,19 @@ void ShortcutSettingsPage::retranslateUi() searchEdit->setPlaceholderText(tr("Search by shortcut name")); } +static QScrollArea *makeScrollable(QWidget *widget) +{ + widget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Maximum); + + auto *scrollArea = new QScrollArea; + scrollArea->setWidgetResizable(true); + scrollArea->setContentsMargins(0, 0, 0, 0); + scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + scrollArea->horizontalScrollBar()->setEnabled(false); + scrollArea->setWidget(widget); + return scrollArea; +} + DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent) { auto rec = QGuiApplication::primaryScreen()->availableGeometry(); @@ -1471,8 +1486,8 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent) pagesWidget = new QStackedWidget; pagesWidget->addWidget(new GeneralSettingsPage); - pagesWidget->addWidget(new AppearanceSettingsPage); - pagesWidget->addWidget(new UserInterfaceSettingsPage); + pagesWidget->addWidget(makeScrollable(new AppearanceSettingsPage)); + pagesWidget->addWidget(makeScrollable(new UserInterfaceSettingsPage)); pagesWidget->addWidget(new DeckEditorSettingsPage); pagesWidget->addWidget(new MessagesSettingsPage); pagesWidget->addWidget(new SoundSettingsPage);