Commit e7ca9e92 authored by Valentin Platzgummer's avatar Valentin Platzgummer

123

parent 86019129
...@@ -606,7 +606,7 @@ QGCView { ...@@ -606,7 +606,7 @@ QGCView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.leftMargin: ScreenTools.defaultFontPixelWidth anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.bottomMargin: 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 maxHeight: parent.height - toolStrip.height - toolStrip.y - ScreenTools.defaultFontPixelHeight*4
......
...@@ -47,6 +47,7 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie ...@@ -47,6 +47,7 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie
, _ignoreRecalc (false) , _ignoreRecalc (false)
, _complexDistance (0) , _complexDistance (0)
, _cameraShots (0) , _cameraShots (0)
, _cruiseSpeed (0)
, _cameraCalc (vehicle, settingsGroup) , _cameraCalc (vehicle, settingsGroup)
, _followTerrain (false) , _followTerrain (false)
, _loadedMissionItemsParent (nullptr) , _loadedMissionItemsParent (nullptr)
......
...@@ -17,8 +17,9 @@ QColor QGCMapPalette::_thumbJoystick[QGCMapPalette::_cColorGroups] = { QColor(25 ...@@ -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::_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) }; QColor QGCMapPalette::_textOutline [QGCMapPalette::_cColorGroups] = { QColor(0,0,0,192), QColor(255,255,255,192) };
QGCMapPalette::QGCMapPalette(QObject* parent) : QGCMapPalette::QGCMapPalette(QObject* parent)
QObject(parent) : QObject(parent)
, _lightColors(false)
{ {
} }
......
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