diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index eedeb42efbc42c108790d4bbf84627c316b7910a..f647c7a979e31f6da89dc9d581aa17564d5f298d 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 c54adff6e01b758396afbee158745902f320795c..2466aa2667a3e9096a50e81d877e05c4e0a0029f 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 47af675f1ad355c3939cf33af327e2c80df076c3..a7acc9eb86f4d90a7fe22a797c927b34082a22f1 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) { }