Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
9f760e33
Commit
9f760e33
authored
Dec 03, 2016
by
Don Gagne
Committed by
GitHub
Dec 03, 2016
Browse files
Merge pull request #4282 from DonLakeFlyer/SettingsFix
Hide view before settings source
parents
64716509
eb4de378
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/MainWindowInner.qml
View file @
9f760e33
...
...
@@ -66,12 +66,13 @@ Item {
}
//-- In settings view, the full height is available. Set to 0 so it is ignored.
ScreenTools
.
availableHeight
=
0
hideAllViews
()
if
(
settingsViewLoader
.
source
!=
_settingsViewSource
)
{
settingsViewLoader
.
source
=
_settingsViewSource
}
hideAllViews
()
settingsViewLoader
.
visible
=
true
toolBar
.
checkSettingsButton
()
console
.
log
(
"
showSettingsView
"
)
}
function
showSetupView
()
{
...
...
@@ -80,10 +81,10 @@ Item {
}
//-- In setup view, the full height is available. Set to 0 so it is ignored.
ScreenTools
.
availableHeight
=
0
hideAllViews
()
if
(
setupViewLoader
.
source
!=
_setupViewSource
)
{
setupViewLoader
.
source
=
_setupViewSource
}
hideAllViews
()
setupViewLoader
.
visible
=
true
toolBar
.
checkSetupButton
()
}
...
...
@@ -284,13 +285,13 @@ Item {
anchors.top
:
toolBar
.
bottom
anchors.bottom
:
parent
.
bottom
visible
:
false
/*
onVisibleChanged: {
if (!visible) {
// Free up the memory for this when not shown. No need to persist.
source = ""
}
}
}
*/
}
Loader
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment