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
1d0f517f
Commit
1d0f517f
authored
Mar 08, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new QGCMouseArea and minTouchPixels
parent
1f77b2f7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
29 deletions
+37
-29
MissionItemIndicatorDrag.qml
src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
+20
-18
MissionItemEditor.qml
src/MissionEditor/MissionItemEditor.qml
+13
-7
ToolStrip.qml
src/QmlControls/ToolStrip.qml
+4
-4
No files found.
src/FlightMap/MapItems/MissionItemIndicatorDrag.qml
View file @
1d0f517f
...
@@ -17,30 +17,31 @@ import QGroundControl.Controls 1.0
...
@@ -17,30 +17,31 @@ import QGroundControl.Controls 1.0
/// Use the drag a MissionItemIndicator
/// Use the drag a MissionItemIndicator
Rectangle
{
Rectangle
{
id
:
itemDragger
id
:
itemDragger
x
:
itemIndicator
.
x
-
_
expandMargin
x
:
itemIndicator
.
x
-
_
touchMarginHorizontal
y
:
itemIndicator
.
y
-
_
expandMargin
y
:
itemIndicator
.
y
-
_
touchMarginVertical
width
:
itemIndicator
.
width
+
(
_
expandMargin
*
2
)
width
:
itemIndicator
.
width
+
(
_
touchMarginHorizontal
*
2
)
height
:
itemIndicator
.
height
+
(
_
expandMargin
*
2
)
height
:
itemIndicator
.
height
+
(
_
touchMarginVertical
*
2
)
color
:
"
transparent
"
color
:
"
transparent
"
z
:
QGroundControl
.
zOrderMapItems
+
1
// Above item icons
z
:
QGroundControl
.
zOrderMapItems
+
1
// Above item icons
// These are handy for debugging so left in for now
//border.width: 1
//border.color: "white"
// Properties which must be specific by consumer
// Properties which must be specific by consumer
property
var
itemIndicator
///< The mission item indicator to drag around
property
var
itemIndicator
///< The mission item indicator to drag around
property
var
itemCoordinate
///< Coordinate we are updating during drag
property
var
itemCoordinate
///< Coordinate we are updating during drag
property
bool
_preventCoordinateBindingLoop
:
false
property
bool
_preventCoordinateBindingLoop
:
false
property
real
_expandMargin
:
ScreenTools
.
isMobile
?
ScreenTools
.
defaultFontPixelWidth
:
0
property
bool
_mobile
:
true
//ScreenTools.isMobile
property
real
_touchWidth
:
Math
.
max
(
itemIndicator
.
width
,
ScreenTools
.
minTouchPixels
)
property
real
_touchHeight
:
Math
.
max
(
itemIndicator
.
height
,
ScreenTools
.
minTouchPixels
)
property
real
_touchMarginHorizontal
:
_mobile
?
(
_touchWidth
-
itemIndicator
.
width
)
/
2
:
0
property
real
_touchMarginVertical
:
_mobile
?
(
_touchHeight
-
itemIndicator
.
height
)
/
2
:
0
onXChanged
:
liveDrag
()
onXChanged
:
liveDrag
()
onYChanged
:
liveDrag
()
onYChanged
:
liveDrag
()
function
liveDrag
()
{
function
liveDrag
()
{
if
(
!
itemDragger
.
_preventCoordinateBindingLoop
&&
Drag
.
active
)
{
if
(
!
itemDragger
.
_preventCoordinateBindingLoop
&&
Drag
.
active
)
{
var
point
=
Qt
.
point
(
itemDragger
.
x
+
_
expandMargin
+
itemIndicator
.
anchorPoint
.
x
,
itemDragger
.
y
+
_expandMargin
+
itemIndicator
.
anchorPoint
.
y
)
var
point
=
Qt
.
point
(
itemDragger
.
x
+
_
touchMarginHorizontal
+
itemIndicator
.
anchorPoint
.
x
,
itemDragger
.
y
+
_touchMarginVertical
+
itemIndicator
.
anchorPoint
.
y
)
var
coordinate
=
map
.
toCoordinate
(
point
)
var
coordinate
=
map
.
toCoordinate
(
point
)
itemDragger
.
_preventCoordinateBindingLoop
=
true
itemDragger
.
_preventCoordinateBindingLoop
=
true
coordinate
.
altitude
=
itemCoordinate
.
altitude
coordinate
.
altitude
=
itemCoordinate
.
altitude
...
@@ -51,7 +52,7 @@ Rectangle {
...
@@ -51,7 +52,7 @@ Rectangle {
Drag.active
:
itemDrag
.
drag
.
active
Drag.active
:
itemDrag
.
drag
.
active
MouseArea
{
QGC
MouseArea
{
id
:
itemDrag
id
:
itemDrag
anchors.fill
:
parent
anchors.fill
:
parent
drag.target
:
parent
drag.target
:
parent
...
@@ -59,5 +60,6 @@ Rectangle {
...
@@ -59,5 +60,6 @@ Rectangle {
drag.minimumY
:
0
drag.minimumY
:
0
drag.maximumX
:
itemDragger
.
parent
.
width
-
parent
.
width
drag.maximumX
:
itemDragger
.
parent
.
width
-
parent
.
width
drag.maximumY
:
itemDragger
.
parent
.
height
-
parent
.
height
drag.maximumY
:
itemDragger
.
parent
.
height
-
parent
.
height
preventStealing
:
true
}
}
}
}
src/MissionEditor/MissionItemEditor.qml
View file @
1d0f517f
...
@@ -68,16 +68,22 @@ Rectangle {
...
@@ -68,16 +68,22 @@ Rectangle {
}
}
MouseArea
{
QGC
MouseArea
{
// The MouseArea for the hamburger is larger than the hamburger image itself in order to provide a larger
// The MouseArea for the hamburger is larger than the hamburger image itself in order to provide a larger
// touch area on mobile
// touch area on mobile
anchors.top
:
parent
.
top
anchors.leftMargin
:
-
_touchMarginHorizontal
anchors.bottom
:
editorLoader
.
top
anchors.rightMargin
:
-
_touchMarginHorizontal
anchors.leftMargin
:
-
hamburger
.
anchors
.
rightMargin
anchors.topMargin
:
-
_touchMarginVertical
anchors.left
:
hamburger
.
left
anchors.bottomMargin
:
-
_touchMarginVertical
anchors.right
:
parent
.
right
anchors.fill
:
hamburger
visible
:
hamburger
.
visible
onClicked
:
hamburgerMenu
.
popup
()
onClicked
:
hamburgerMenu
.
popup
()
property
real
_touchWidth
:
Math
.
max
(
hamburger
.
width
,
ScreenTools
.
minTouchPixels
)
property
real
_touchHeight
:
Math
.
max
(
hamburger
.
height
,
ScreenTools
.
minTouchPixels
)
property
real
_touchMarginHorizontal
:
ScreenTools
.
isMobile
?
(
_touchWidth
-
hamburger
.
width
)
/
2
:
0
property
real
_touchMarginVertical
:
ScreenTools
.
isMobile
?
(
_touchHeight
-
hamburger
.
height
)
/
2
:
0
Menu
{
Menu
{
id
:
hamburgerMenu
id
:
hamburgerMenu
...
...
src/QmlControls/ToolStrip.qml
View file @
1d0f517f
...
@@ -16,7 +16,7 @@ import QGroundControl.Palette 1.0
...
@@ -16,7 +16,7 @@ import QGroundControl.Palette 1.0
Rectangle
{
Rectangle
{
id
:
_root
id
:
_root
color
:
qgcPal
.
window
color
:
qgcPal
.
window
width
:
ScreenTools
.
defaultFontPixelWidth
*
6
width
:
ScreenTools
.
isMobile
?
ScreenTools
.
minTouchPixels
:
ScreenTools
.
defaultFontPixelWidth
*
6
height
:
buttonStripColumn
.
height
+
(
buttonStripColumn
.
anchors
.
margins
*
2
)
height
:
buttonStripColumn
.
height
+
(
buttonStripColumn
.
anchors
.
margins
*
2
)
radius
:
_radius
radius
:
_radius
...
@@ -172,10 +172,10 @@ Rectangle {
...
@@ -172,10 +172,10 @@ Rectangle {
}
}
MouseArea
{
QGC
MouseArea
{
// Size of mouse area is expanded to make touch easier
// Size of mouse area is expanded to make touch easier
anchors.leftMargin
:
buttonStripColumn
.
margins
anchors.leftMargin
:
-
buttonStripColumn
.
anchors
.
margins
anchors.rightMargin
:
buttonStripColumn
.
margins
anchors.rightMargin
:
-
buttonStripColumn
.
anchors
.
margins
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
...
...
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