Browse Source

Merge pull request #4661 from DonLakeFlyer/LostClicks

Plan: MissionItemEditor - Workaround strange lost clicks possible Qt bug
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
aaa80e7e60
  1. 23
      src/MissionEditor/MissionEditor.qml
  2. 1
      src/MissionEditor/MissionItemEditor.qml

23
src/MissionEditor/MissionEditor.qml

@ -253,16 +253,19 @@ QGCView { @@ -253,16 +253,19 @@ QGCView {
}
function setCurrentItem(sequenceNumber) {
editorMap.polygonDraw.cancelPolygonEdit()
_currentMissionItem = undefined
for (var i=0; i<_visualItems.count; i++) {
var visualItem = _visualItems.get(i)
if (visualItem.sequenceNumber == sequenceNumber) {
_currentMissionItem = visualItem
_currentMissionItem.isCurrentItem = true
_currentMissionIndex = i
} else {
visualItem.isCurrentItem = false
if (sequenceNumber !== _currentMissionIndex) {
editorMap.polygonDraw.cancelPolygonEdit()
_currentMissionItem = undefined
_currentMissionIndex = -1
for (var i=0; i<_visualItems.count; i++) {
var visualItem = _visualItems.get(i)
if (visualItem.sequenceNumber == sequenceNumber) {
_currentMissionItem = visualItem
_currentMissionItem.isCurrentItem = true
_currentMissionIndex = i
} else {
visualItem.isCurrentItem = false
}
}
}
}

1
src/MissionEditor/MissionItemEditor.qml

@ -42,7 +42,6 @@ Rectangle { @@ -42,7 +42,6 @@ Rectangle {
MouseArea {
anchors.fill: parent
visible: !missionItem.isCurrentItem
onClicked: _root.clicked()
}

Loading…
Cancel
Save