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
17351cf2
Commit
17351cf2
authored
Mar 07, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made my own copy of showHighLight so I don't need to change the base class.
parent
a30a125a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
QGCButton.qml
src/QmlControls/QGCButton.qml
+3
-3
QGCToolBarButton.qml
src/QmlControls/QGCToolBarButton.qml
+1
-0
No files found.
src/QmlControls/QGCButton.qml
View file @
17351cf2
...
...
@@ -9,10 +9,10 @@ import QGroundControl.MousePosition 1.0
Button
{
// primary: true - this is the primary button for this group of buttons
property
bool
primary
:
false
property
bool
showHighlight
:
(
pressed
|
hovered
|
checked
)
&&
!
__forceHoverOff
property
var
__qgcPal
:
QGCPalette
{
colorGroupEnabled
:
enabled
}
property
bool
__showHighLight
:
(
pressed
|
hovered
|
checked
)
&&
!
__forceHoverOff
// This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can
// move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn
...
...
@@ -70,7 +70,7 @@ Button {
Rectangle
{
anchors.fill
:
parent
color
:
showHighl
ight
?
color
:
__showHighL
ight
?
control
.
__qgcPal
.
buttonHighlight
:
(
primary
?
control
.
__qgcPal
.
primaryButton
:
control
.
__qgcPal
.
button
)
}
...
...
@@ -107,7 +107,7 @@ Button {
renderType
:
Text
.
NativeRendering
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
control
.
text
color
:
showHighl
ight
?
color
:
__showHighL
ight
?
control
.
__qgcPal
.
buttonHighlightText
:
(
primary
?
control
.
__qgcPal
.
primaryButtonText
:
control
.
__qgcPal
.
buttonText
)
}
...
...
src/QmlControls/QGCToolBarButton.qml
View file @
17351cf2
...
...
@@ -10,6 +10,7 @@ QGCButton {
id
:
button
property
bool
repaintChevron
:
false
property
var
__qgcPal
:
QGCPalette
{
colorGroupEnabled
:
enabled
}
property
bool
showHighlight
:
__showHighLight
style
:
ButtonStyle
{
background
:
Item
{
anchors.margins
:
3
...
...
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