From 743a03626f6c0b23723e5e42c75212047e27767f Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Wed, 26 Sep 2018 16:44:56 +0200
Subject: [PATCH] Fix bug with dock resizes (#2170)
---
GUI/coregui/Views/CommonWidgets/DocksController.cpp | 5 +++++
GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h | 2 ++
GUI/coregui/mainwindow/aboutapplicationdialog.cpp | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/GUI/coregui/Views/CommonWidgets/DocksController.cpp b/GUI/coregui/Views/CommonWidgets/DocksController.cpp
index 9eb9030e836..fdb0b695fcf 100644
--- a/GUI/coregui/Views/CommonWidgets/DocksController.cpp
+++ b/GUI/coregui/Views/CommonWidgets/DocksController.cpp
@@ -55,6 +55,11 @@ void DocksController::onResetLayout()
for (auto& it : m_docks)
m_mainWindow->addDockWidget(it.second.area(), it.second.dock());
+ // Fixes issue: https://bugreports.qt.io/browse/QTBUG-65592
+ dockWidgetList = m_mainWindow->dockWidgets();
+ if (dockWidgetList.size()>0)
+ m_mainWindow->resizeDocks({dockWidgetList.first()}, {10}, Qt::Horizontal);
+
for (QDockWidget* dockWidget : dockWidgetList)
dockWidget->show();
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
index 75b11b9f289..53330d15bf0 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
@@ -27,6 +27,8 @@ class BA_CORE_API_ SampleWidgetBox : public QWidget
public:
explicit SampleWidgetBox(SampleDesignerInterface *core, QWidget *parent);
+ QSize minimumSizeHint() const override { return QSize(300, 300); }
+
private:
SampleDesignerInterface *m_core;
QDesignerWidgetBoxInterface *m_widgetBox;
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
index 90a8730328d..dbcbbc9bd93 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
@@ -141,7 +141,7 @@ QBoxLayout* AboutApplicationDialog::createButtonLayout()
result->addStretch(1);
result->addWidget(closeButton);
- static const char mydata[] = {0x62, 0x65, 0x65, 0x72};
+ static const char mydata[] = {0x64, 0x65, 0x76, 0x73};
QByteArray b = QByteArray::fromRawData(mydata, sizeof(mydata));
auto f = new ShortcodeFilter(b, this);
connect(f, &ShortcodeFilter::found, this, [=]() { layout()->addWidget(createLogoLabel());});
--
GitLab