Commit 63e7b8b7 authored by Don Gagne's avatar Don Gagne

Fix inner root qml object sizing

parent 103d669f
...@@ -30,6 +30,7 @@ QGCQmlWidgetHolder::QGCQmlWidgetHolder(QWidget *parent) : ...@@ -30,6 +30,7 @@ QGCQmlWidgetHolder::QGCQmlWidgetHolder(QWidget *parent) :
QWidget(parent) QWidget(parent)
{ {
_ui.setupUi(this); _ui.setupUi(this);
_ui.qmlWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
} }
QGCQmlWidgetHolder::~QGCQmlWidgetHolder() QGCQmlWidgetHolder::~QGCQmlWidgetHolder()
......
...@@ -49,6 +49,8 @@ SetupView::SetupView(QWidget* parent) : ...@@ -49,6 +49,8 @@ SetupView::SetupView(QWidget* parent) :
Q_UNUSED(fSucceeded); Q_UNUSED(fSucceeded);
Q_ASSERT(fSucceeded); Q_ASSERT(fSucceeded);
setResizeMode(SizeRootObjectToView);
_setActiveUAS(NULL); _setActiveUAS(NULL);
} }
......
...@@ -9,7 +9,6 @@ Rectangle { ...@@ -9,7 +9,6 @@ Rectangle {
id: topLevel id: topLevel
objectName: "topLevel" objectName: "topLevel"
anchors.fill: parent
color: palette.window color: palette.window
signal buttonClicked(variant component); signal buttonClicked(variant component);
......
...@@ -6,7 +6,6 @@ import QGroundControl.FactSystem 1.0 ...@@ -6,7 +6,6 @@ import QGroundControl.FactSystem 1.0
Rectangle { Rectangle {
QGCPalette { id: palette; colorGroup: QGCPalette.Active } QGCPalette { id: palette; colorGroup: QGCPalette.Active }
anchors.fill: parent
color: palette.window color: palette.window
Item { Item {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment