Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
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
Administrator
linphone-desktop
Commits
14cac8ad
Commit
14cac8ad
authored
Oct 26, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Menu/ActionMenu): supports many colors (hovered, normal, pressed), also fix `escape` event
parent
9fca87d6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
2 deletions
+21
-2
Colors.qml
tests/ui/modules/Common/Colors.qml
+4
-0
ActionMenu.qml
tests/ui/modules/Common/Menu/ActionMenu.qml
+8
-1
AbstractDropDownMenu.qml
tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml
+3
-0
ActionMenuStyle.qml
tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml
+6
-1
No files found.
tests/ui/modules/Common/Colors.qml
View file @
14cac8ad
...
...
@@ -29,4 +29,8 @@ QtObject {
property
color
q
:
'
#E6E6E6
'
property
color
r
:
'
#8F8F8F
'
property
color
s
:
'
#D64D00
'
property
color
t
:
'
#FF8600
'
}
tests/ui/modules/Common/Menu/ActionMenu.qml
View file @
14cac8ad
...
...
@@ -22,7 +22,12 @@ ColumnLayout {
model
:
entries
Rectangle
{
color
:
ActionMenuStyle
.
entry
.
color
color
:
mouseArea
.
pressed
?
ActionMenuStyle
.
entry
.
color
.
pressed
:
(
mouseArea
.
containsMouse
?
ActionMenuStyle
.
entry
.
color
.
hovered
:
ActionMenuStyle
.
entry
.
color
.
normal
)
height
:
menu
.
entryHeight
width
:
menu
.
entryWidth
...
...
@@ -43,6 +48,8 @@ ColumnLayout {
}
MouseArea
{
id
:
mouseArea
anchors.fill
:
parent
hoverEnabled
:
true
...
...
tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml
View file @
14cac8ad
...
...
@@ -42,6 +42,9 @@ Item {
visible
=
true
menuOpened
()
// Necessary to use `Keys.onEscapePressed`.
focus
=
true
}
function
hideMenu
()
{
...
...
tests/ui/modules/Common/Styles/Menu/ActionMenuStyle.qml
View file @
14cac8ad
...
...
@@ -9,10 +9,15 @@ QtObject {
property
int
spacing
:
1
property
QtObject
entry
:
QtObject
{
property
color
color
:
Colors
.
i
property
int
leftMargin
:
4
property
int
rightMargin
:
4
property
QtObject
color
:
QtObject
{
property
color
hovered
:
Colors
.
s
property
color
normal
:
Colors
.
i
property
color
pressed
:
Colors
.
t
}
property
QtObject
text
:
QtObject
{
property
color
color
:
Colors
.
k
property
int
fontSize
:
8
...
...
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