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
6e440461
Commit
6e440461
authored
Jun 12, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Common/Form/ComboBox): deal correctly with `leftMargin` and Qt5.8
parent
3dd47411
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
ComboBox.qml
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
+5
-1
No files found.
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
View file @
6e440461
...
...
@@ -4,6 +4,8 @@ import QtQuick.Layouts 1.3
import
Common
1.0
import
Common
.
Styles
1.0
import
Linphone
1.0
import
Utils
1.0
import
'
ComboBox.js
'
as
Logic
...
...
@@ -40,7 +42,9 @@ ComboBox {
RowLayout
{
anchors
{
fill
:
parent
leftMargin
:
ComboBoxStyle
.
contentItem
.
leftMargin
leftMargin
:
!
Utils
.
startsWith
(
App
.
qtVersion
,
'
5.8
'
)
?
ComboBoxStyle
.
contentItem
.
leftMargin
// >= 5.9
:
0
// 5.8
}
spacing
:
ComboBoxStyle
.
contentItem
.
spacing
...
...
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