From 63e7b8b7edd54fad418f33e0fac3fa980fd8dd9b Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 27 Dec 2014 16:48:29 -0800 Subject: [PATCH] Fix inner root qml object sizing --- src/QGCQmlWidgetHolder.cpp | 1 + src/VehicleSetup/SetupView.cc | 2 ++ src/VehicleSetup/SetupViewConnected.qml | 1 - src/VehicleSetup/SetupViewDisconnected.qml | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/QGCQmlWidgetHolder.cpp b/src/QGCQmlWidgetHolder.cpp index 75beeb7d1..986633c5e 100644 --- a/src/QGCQmlWidgetHolder.cpp +++ b/src/QGCQmlWidgetHolder.cpp @@ -30,6 +30,7 @@ QGCQmlWidgetHolder::QGCQmlWidgetHolder(QWidget *parent) : QWidget(parent) { _ui.setupUi(this); + _ui.qmlWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); } QGCQmlWidgetHolder::~QGCQmlWidgetHolder() diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc index 9149f1db0..c1ec1106b 100644 --- a/src/VehicleSetup/SetupView.cc +++ b/src/VehicleSetup/SetupView.cc @@ -49,6 +49,8 @@ SetupView::SetupView(QWidget* parent) : Q_UNUSED(fSucceeded); Q_ASSERT(fSucceeded); + setResizeMode(SizeRootObjectToView); + _setActiveUAS(NULL); } diff --git a/src/VehicleSetup/SetupViewConnected.qml b/src/VehicleSetup/SetupViewConnected.qml index b0857fd14..cd2956d62 100644 --- a/src/VehicleSetup/SetupViewConnected.qml +++ b/src/VehicleSetup/SetupViewConnected.qml @@ -9,7 +9,6 @@ Rectangle { id: topLevel objectName: "topLevel" - anchors.fill: parent color: palette.window signal buttonClicked(variant component); diff --git a/src/VehicleSetup/SetupViewDisconnected.qml b/src/VehicleSetup/SetupViewDisconnected.qml index 37e0a35cb..5ab982909 100644 --- a/src/VehicleSetup/SetupViewDisconnected.qml +++ b/src/VehicleSetup/SetupViewDisconnected.qml @@ -6,7 +6,6 @@ import QGroundControl.FactSystem 1.0 Rectangle { QGCPalette { id: palette; colorGroup: QGCPalette.Active } - anchors.fill: parent color: palette.window Item { -- 2.22.0