Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a014240f
Commit
a014240f
authored
Jun 14, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move message area to top
Height will shrink to fit small text heights
parent
727c55fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
13 deletions
+14
-13
MainWindowInner.qml
src/ui/MainWindowInner.qml
+14
-13
No files found.
src/ui/MainWindowInner.qml
View file @
a014240f
...
...
@@ -426,7 +426,19 @@ Item {
//-------------------------------------------------------------------------
//-- Critical Message Area
Rectangle
{
id
:
criticalMmessageArea
id
:
criticalMmessageArea
width
:
mainWindow
.
width
*
0.55
height
:
Math
.
min
(
criticalMessageText
.
height
+
_textMargins
*
2
,
ScreenTools
.
defaultFontPixelHeight
*
6
)
color
:
"
#eecc44
"
visible
:
false
radius
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.top
:
parent
.
top
anchors.topMargin
:
tbHeight
+
ScreenTools
.
defaultFontPixelHeight
/
2
border.color
:
"
#808080
"
border.width
:
2
readonly
property
real
_textMargins
:
ScreenTools
.
defaultFontPixelHeight
function
close
()
{
//-- Are there messages in the waiting queue?
...
...
@@ -445,17 +457,6 @@ Item {
}
}
width
:
mainWindow
.
width
*
0.55
height
:
ScreenTools
.
defaultFontPixelHeight
*
6
color
:
"
#eecc44
"
visible
:
false
radius
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.bottom
:
parent
.
bottom
anchors.bottomMargin
:
ScreenTools
.
defaultFontPixelHeight
border.color
:
"
#808080
"
border.width
:
2
MouseArea
{
// This MouseArea prevents the Map below it from getting Mouse events. Without this
// things like mousewheel will scroll the Flickable and then scroll the map as well.
...
...
@@ -466,7 +467,7 @@ Item {
Flickable
{
id
:
criticalMessageFlick
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
parent
.
_textMargins
anchors.fill
:
parent
contentHeight
:
criticalMessageText
.
height
contentWidth
:
criticalMessageText
.
width
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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