aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-16 01:20:03 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-16 01:20:03 +0300
commit6785f357622363edf73cb55763b730bcb0542229 (patch)
tree3f5d58efd66bbb4af62456c106eea39c2d9db61c
parent2268df7b152ac6de774d4eb8afa7ae502026b543 (diff)
Begin implementation of scroll bars in the options menu
-rw-r--r--include/aooptionsdialog.h1
-rw-r--r--src/aooptionsdialog.cpp10
2 files changed, 9 insertions, 2 deletions
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 03226619..51984106 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -25,6 +25,7 @@
#include <QtWidgets/QTabWidget>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget>
+#include <QtWidgets/QScrollArea>
#include <QDirIterator>
#include <QTextStream>
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 7c524022..b9267821 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -12,7 +12,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_settings_buttons = new QDialogButtonBox(this);
- QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Maximum);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(ui_settings_buttons->sizePolicy().hasHeightForWidth());
@@ -37,9 +37,9 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
// First, we'll start with 'Gameplay'.
ui_gameplay_tab = new QWidget();
ui_settings_tabs->addTab(ui_gameplay_tab, tr("Gameplay"));
-
ui_form_layout_widget = new QWidget(ui_gameplay_tab);
ui_form_layout_widget->setGeometry(QRect(10, 10, 361, 211));
+ ui_form_layout_widget->setSizePolicy(sizePolicy1);
ui_gameplay_form = new QFormLayout(ui_form_layout_widget);
ui_gameplay_form->setLabelAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
@@ -216,6 +216,12 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_framenetwork_cb);
+ QScrollArea *scroll = new QScrollArea;
+ scroll->setWidget(ui_form_layout_widget);
+ ui_gameplay_tab->setLayout(new QVBoxLayout);
+ ui_gameplay_tab->layout()->addWidget(scroll);
+ ui_gameplay_tab->show();
+
// Here we start the callwords tab.
ui_callwords_tab = new QWidget();
ui_settings_tabs->addTab(ui_callwords_tab, tr("Callwords"));