diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp index 9e076408..bb7c2f5c 100644 --- a/src/lib_gui/qt/window/QtWindow.cpp +++ b/src/lib_gui/qt/window/QtWindow.cpp @@ -125,7 +125,7 @@ void QtWindow::setup() setPreviousVisible(false); } - windowReady(); + setupDone(); } void QtWindow::setCancelAble(bool cancelable) @@ -318,6 +318,24 @@ void QtWindow::handleClose() emit canceled(); } +void QtWindow::setupDone() +{ + windowReady(); + + QSize actualSize = m_window->sizeHint() + QSize(50, 50); + QSize preferredSize = sizeHint(); + + if (actualSize.height() > preferredSize.height()) + { + resize(actualSize); + } + else + { + resize(preferredSize); + } + +} + void QtWindow::addLogo() { QtDeviceScaledPixmap coatiLogo((ResourcePaths::getGuiPath() + "window/logo.png").c_str()); diff --git a/src/lib_gui/qt/window/QtWindow.h b/src/lib_gui/qt/window/QtWindow.h index 2b481789..b5304d9f 100644 --- a/src/lib_gui/qt/window/QtWindow.h +++ b/src/lib_gui/qt/window/QtWindow.h @@ -67,6 +67,7 @@ protected: virtual void handlePrevious(); virtual void handleClose(); + void setupDone(); void addLogo(); QWidget* m_window; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp index f37eb663..7ea9fb0d 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp @@ -15,6 +15,15 @@ QtProjectWizzardWindow::QtProjectWizzardWindow(QWidget *parent) { } +QSize QtProjectWizzardWindow::sizeHint() const +{ + if (content()) + { + return content()->preferredWindowSize(); + } + return QSize(); +} + QtProjectWizzardContent* QtProjectWizzardWindow::content() const { return m_content; @@ -65,18 +74,6 @@ void QtProjectWizzardWindow::windowReady() updateTitle("NEW PROJECT"); m_content->windowReady(); - - QSize actualSize = m_window->sizeHint() + QSize(50, 50); - QSize preferredSize = content()->preferredWindowSize(); - - if (actualSize.height() > preferredSize.height()) - { - resize(actualSize); - } - else - { - resize(preferredSize); - } } void QtProjectWizzardWindow::handleNext() diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h index dfb9c3d5..349dff29 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h @@ -13,6 +13,7 @@ class QtProjectWizzardWindow public: QtProjectWizzardWindow(QWidget *parent); + virtual QSize sizeHint() const override; QtProjectWizzardContent* content() const; void setContent(QtProjectWizzardContent* content);