From e7ca9e9284e3c0d57a493cdda9208d521c161b8a Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Fri, 20 Dec 2019 18:20:06 +0100 Subject: [PATCH] 123 --- src/FlightDisplay/FlightDisplayView.qml | 2 +- src/MissionManager/TransectStyleComplexItem.cc | 1 + src/QGCMapPalette.cc | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index eedeb42ef..f647c7a97 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -606,7 +606,7 @@ QGCView { anchors.bottom: parent.bottom anchors.leftMargin: ScreenTools.defaultFontPixelWidth anchors.bottomMargin: ScreenTools.defaultFontPixelWidth - maxWidth: Math.min(300, singleMultiSelector.x - ScreenTools.defaultFontPixelHeight*4 ) + maxWidth: singleMultiSelector.x - ScreenTools.defaultFontPixelHeight*4 maxHeight: parent.height - toolStrip.height - toolStrip.y - ScreenTools.defaultFontPixelHeight*4 diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc index c54adff6e..2466aa266 100644 --- a/src/MissionManager/TransectStyleComplexItem.cc +++ b/src/MissionManager/TransectStyleComplexItem.cc @@ -47,6 +47,7 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie , _ignoreRecalc (false) , _complexDistance (0) , _cameraShots (0) + , _cruiseSpeed (0) , _cameraCalc (vehicle, settingsGroup) , _followTerrain (false) , _loadedMissionItemsParent (nullptr) diff --git a/src/QGCMapPalette.cc b/src/QGCMapPalette.cc index 47af675f1..a7acc9eb8 100644 --- a/src/QGCMapPalette.cc +++ b/src/QGCMapPalette.cc @@ -17,8 +17,9 @@ QColor QGCMapPalette::_thumbJoystick[QGCMapPalette::_cColorGroups] = { QColor(25 QColor QGCMapPalette::_text [QGCMapPalette::_cColorGroups] = { QColor(255,255,255), QColor(0,0,0) }; QColor QGCMapPalette::_textOutline [QGCMapPalette::_cColorGroups] = { QColor(0,0,0,192), QColor(255,255,255,192) }; -QGCMapPalette::QGCMapPalette(QObject* parent) : - QObject(parent) +QGCMapPalette::QGCMapPalette(QObject* parent) + : QObject(parent) + , _lightColors(false) { } -- 2.22.0