Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/EditWidget.cpp')
-rw-r--r--src/gui/EditWidget.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index 68a8d7d4a..72742b5ac 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -59,12 +59,18 @@ void EditWidget::addPage(const QString& labelText, const QIcon& icon, QWidget* w
* from automatic resizing and it now should be able to fit into a user's monitor even if the monitor is only 768
* pixels high.
*/
- auto* scrollArea = new QScrollArea(m_ui->stackedWidget);
- scrollArea->setFrameShape(QFrame::NoFrame);
- scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scrollArea->setWidget(widget);
- scrollArea->setWidgetResizable(true);
- m_ui->stackedWidget->addWidget(scrollArea);
+ if (widget->inherits("QScrollArea")) {
+ m_ui->stackedWidget->addWidget(widget);
+ } else {
+ auto* scrollArea = new QScrollArea(m_ui->stackedWidget);
+ scrollArea->setFrameShape(QFrame::NoFrame);
+ scrollArea->setFrameShadow(QFrame::Plain);
+ scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scrollArea->setSizeAdjustPolicy(QScrollArea::AdjustToContents);
+ scrollArea->setWidgetResizable(true);
+ scrollArea->setWidget(widget);
+ m_ui->stackedWidget->addWidget(scrollArea);
+ }
m_ui->categoryList->addCategory(labelText, icon);
}