Merge pull request #4243 from DonLakeFlyer/SmallFixes

Small fixes

Merge pull request #4243 from DonLakeFlyer/SmallFixes
Small fixes
4d5fddbd · Don Gagne · GitHub · 3c254e35 · 7cdaddd3 · 4d5fddbd
Commit 4d5fddbd authored Nov 24, 2016 by Don Gagne Committed by GitHub Nov 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

MissionEditor.qml src/MissionEditor/MissionEditor.qml +0 -1

DropButton.qml src/QmlControls/DropButton.qml +1 -1

No files found.
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -1191,7 +1191,6 @@ QGCView {
                    Layout.fillWidth:   true
                    onClicked:  {
                        syncButton.hideDropDown()
-                        _syncDropDownController.removeAll()
                        qgcView.showDialog(removeAllPromptDialog, qsTr("Remove all"), qgcView.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
                    }
                }

--- a/src/QmlControls/DropButton.qml
+++ b/src/QmlControls/DropButton.qml
@@ -111,7 +111,7 @@ Item {
            dropItemHolderRect.y = 0

            if (dropDirection == dropLeft) {
-                dropDownItem.x = dropDownItem.width + _dropMargin
+                dropDownItem.x = -(dropDownItem.width + _dropMargin)

                dropItemHolderRect.x = 0
            } else {