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
e8f5964f
Commit
e8f5964f
authored
Jul 19, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ComboBox): change background color if ComboBox instance is disabled
parent
1fb8e3e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
ComboBox.qml
ui/modules/Common/Form/ComboBox.qml
+4
-1
ComboBoxStyle.qml
ui/modules/Common/Styles/Form/ComboBoxStyle.qml
+5
-1
No files found.
ui/modules/Common/Form/ComboBox.qml
View file @
e8f5964f
...
@@ -26,7 +26,10 @@ ComboBox {
...
@@ -26,7 +26,10 @@ ComboBox {
width
:
ComboBoxStyle
.
background
.
border
.
width
width
:
ComboBoxStyle
.
background
.
border
.
width
}
}
color
:
ComboBoxStyle
.
background
.
color
color
:
comboBox
.
enabled
?
ComboBoxStyle
.
background
.
color
.
normal
:
ComboBoxStyle
.
background
.
color
.
readOnly
radius
:
ComboBoxStyle
.
background
.
radius
radius
:
ComboBoxStyle
.
background
.
radius
implicitHeight
:
ComboBoxStyle
.
background
.
height
implicitHeight
:
ComboBoxStyle
.
background
.
height
...
...
ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file @
e8f5964f
...
@@ -8,7 +8,6 @@ import Units 1.0
...
@@ -8,7 +8,6 @@ import Units 1.0
QtObject
{
QtObject
{
property
QtObject
background
:
QtObject
{
property
QtObject
background
:
QtObject
{
property
color
color
:
Colors
.
k
property
int
height
:
36
property
int
height
:
36
property
int
iconSize
:
10
property
int
iconSize
:
10
property
int
radius
:
4
property
int
radius
:
4
...
@@ -18,6 +17,11 @@ QtObject {
...
@@ -18,6 +17,11 @@ QtObject {
property
color
color
:
Colors
.
c
property
color
color
:
Colors
.
c
property
int
width
:
1
property
int
width
:
1
}
}
property
QtObject
color
:
QtObject
{
property
color
normal
:
Colors
.
k
property
color
readOnly
:
Colors
.
e
}
}
}
property
QtObject
contentItem
:
QtObject
{
property
QtObject
contentItem
:
QtObject
{
...
...
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