ui: moved contentbased sizing to QtWindow

2016-03-11 22:22:57 +01:00
parent 813cde4d26
commit bcb43eccd0
4 changed files with 30 additions and 13 deletions
@@ -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());