Skip to content

Q
qgroundcontrol
Unverified Commit 6683a966 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7997 from mavlink/pr-fix-dlg-logic 

Fix inverted close policy logic.
parents eb793fc5 028bcadb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/ui/MainRootWindow.qml
View file @ 6683a966
...@@ -153,6 +153,9 @@ ApplicationWindow { ...@@ -153,6 +153,9 @@ ApplicationWindow {
mainWindowDialog.dialogButtons = buttons mainWindowDialog.dialogButtons = buttons
mainWindowDialog.open() mainWindowDialog.open()
if(buttons & StandardButton.Cancel || buttons & StandardButton.Close || buttons & StandardButton.Discard || buttons & StandardButton.Abort || buttons & StandardButton.Ignore) { if(buttons & StandardButton.Cancel || buttons & StandardButton.Close || buttons & StandardButton.Discard || buttons & StandardButton.Abort || buttons & StandardButton.Ignore) {
mainWindowDialog.closePolicy = Popup.NoAutoClose;
mainWindowDialog.interactive = false;
} else {
mainWindowDialog.closePolicy = Popup.CloseOnEscape | Popup.CloseOnPressOutside; mainWindowDialog.closePolicy = Popup.CloseOnEscape | Popup.CloseOnPressOutside;
mainWindowDialog.interactive = true; mainWindowDialog.interactive = true;
} }
......
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