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
62428fa1
Commit
62428fa1
authored
Jun 09, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Common/Form/ComboBox): add a left margin (qt 5.9)
parent
ca1f4a44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
ComboBox.qml
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
+23
-14
ComboBoxStyle.qml
...e-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml
+1
-0
No files found.
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
View file @
62428fa1
...
...
@@ -33,27 +33,36 @@ ComboBox {
// ---------------------------------------------------------------------------
contentItem
:
RowLayout
{
spacing
:
ComboBoxStyle
.
contentItem
.
spacing
contentItem
:
Item
{
height
:
comboBox
.
height
width
:
comboBox
.
width
Icon
{
icon
:
Logic
.
getSelectedEntryIcon
()
iconSize
:
ComboBoxStyle
.
contentItem
.
iconSize
RowLayout
{
anchors
{
fill
:
parent
leftMargin
:
ComboBoxStyle
.
contentItem
.
leftMargin
}
visible
:
icon
.
length
>
0
}
spacing
:
ComboBoxStyle
.
contentItem
.
spacing
Text
{
Layout.fillWidth
:
true
Icon
{
icon
:
Logic
.
getSelectedEntryIcon
()
iconSize
:
ComboBoxStyle
.
contentItem
.
iconSize
color
:
ComboBoxStyle
.
contentItem
.
text
.
color
elide
:
Text
.
ElideRight
visible
:
icon
.
length
>
0
}
font.pointSize
:
ComboBoxStyle
.
contentItem
.
text
.
pointSize
rightPadding
:
comboBox
.
indicator
.
width
+
comboBox
.
spacing
Text
{
Layout.fillWidth
:
true
color
:
ComboBoxStyle
.
contentItem
.
text
.
color
elide
:
Text
.
ElideRight
text
:
Logic
.
getSelectedEntryText
()
font.pointSize
:
ComboBoxStyle
.
contentItem
.
text
.
pointSize
rightPadding
:
comboBox
.
indicator
.
width
+
comboBox
.
spacing
text
:
Logic
.
getSelectedEntryText
()
}
}
}
...
...
linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file @
62428fa1
...
...
@@ -22,6 +22,7 @@ QtObject {
property
QtObject
contentItem
:
QtObject
{
property
int
iconSize
:
20
property
int
leftMargin
:
10
property
int
spacing
:
5
property
QtObject
text
:
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