Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
5b89a7ec
Commit
5b89a7ec
authored
Sep 26, 2016
by
Ronan
Browse files
fix(dialog): use dynamic height for dialog description
parent
dcbf6916
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
tests/ui/components/dialog/DialogDescription.qml
tests/ui/components/dialog/DialogDescription.qml
+3
-1
tests/ui/style/components/DialogStyle.qml
tests/ui/style/components/DialogStyle.qml
+1
-2
No files found.
tests/ui/components/dialog/DialogDescription.qml
View file @
5b89a7ec
...
...
@@ -9,7 +9,9 @@ import 'qrc:/ui/style/components'
Item
{
property
alias
text
:
description
.
text
height
:
text
?
DialogStyle
.
description
.
height
:
DialogStyle
.
description
.
minHeight
height
:
(
!
text
&&
DialogStyle
.
description
.
verticalMargin
)
||
undefined
implicitHeight
:
(
text
&&
(
description
.
implicitHeight
+
DialogStyle
.
description
.
verticalMargin
))
||
0
Text
{
id
:
description
...
...
tests/ui/style/components/DialogStyle.qml
View file @
5b89a7ec
...
...
@@ -18,7 +18,6 @@ QtObject {
property
QtObject
description
:
QtObject
{
property
int
fontSize
:
12
property
int
height
:
90
// Height with text.
property
int
minHeight
:
25
// Height without text.
property
int
verticalMargin
:
25
}
}
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