From c47eb0097c8102b1dd482ffd38cb1df6c38fb343 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 28 Nov 2017 05:14:51 -0500 Subject: [PATCH] Fixed instrument widget size for mobile devices Clarify the title of the "Video Stream" panel (instead of just "Video") --- src/FlightDisplay/FlightDisplayViewWidgets.qml | 2 +- src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml | 2 +- src/api/QGCCorePlugin.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 4caab475f..7f9751123 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -40,7 +40,7 @@ Item { function getPreferredInstrumentWidth() { if(ScreenTools.isMobile) { - return ScreenTools.isTinyScreen ? mainWindow.width * 0.2 : mainWindow.width * 0.15 + return mainWindow.width * 0.25 } return ScreenTools.defaultFontPixelWidth * 30 } diff --git a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml index 4e2fe1dc7..290fec81f 100644 --- a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml +++ b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml @@ -20,7 +20,7 @@ import QGroundControl.Palette 1.0 /// Instrument panel shown when virtual thumbsticks are visible Rectangle { id: root - width: ScreenTools.isTinyScreen ? getPreferredInstrumentWidth() * 1.5 : getPreferredInstrumentWidth() + width: getPreferredInstrumentWidth() height: _outerRadius * 2 radius: _outerRadius color: qgcPal.window diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc index 475b98a67..58b06834e 100644 --- a/src/api/QGCCorePlugin.cc +++ b/src/api/QGCCorePlugin.cc @@ -153,7 +153,7 @@ QVariantList& QGCCorePlugin::instrumentPages(void) _p->valuesPageWidgetInfo = new QmlComponentInfo(tr("Values"), QUrl::fromUserInput("qrc:/qml/ValuePageWidget.qml")); _p->cameraPageWidgetInfo = new QmlComponentInfo(tr("Camera"), QUrl::fromUserInput("qrc:/qml/CameraPageWidget.qml")); #if defined(QGC_GST_STREAMING) - _p->videoPageWidgetInfo = new QmlComponentInfo(tr("Video"), QUrl::fromUserInput("qrc:/qml/VideoPageWidget.qml")); + _p->videoPageWidgetInfo = new QmlComponentInfo(tr("Video Stream"), QUrl::fromUserInput("qrc:/qml/VideoPageWidget.qml")); #endif _p->healthPageWidgetInfo = new QmlComponentInfo(tr("Health"), QUrl::fromUserInput("qrc:/qml/HealthPageWidget.qml")); _p->vibrationPageWidgetInfo = new QmlComponentInfo(tr("Vibration"), QUrl::fromUserInput("qrc:/qml/VibrationPageWidget.qml")); -- 2.22.0