Commit 08440e39 authored by Ronan's avatar Ronan
Browse files

fix(app): little fixes

parent 7fdd7f1a
......@@ -22,5 +22,6 @@ QtObject {
property string j: '#434343' // MenuEntry Selected.
property string k: '#FFFFFF' // Text color.
property string l: '#000000' // Text color.
}
}
......@@ -9,10 +9,10 @@ import Linphone.Styles 1.0
Item {
property alias text: description.text
height: (!text && DialogStyle.description.verticalMargin) || undefined
implicitHeight: (text && (
description.implicitHeight + DialogStyle.description.verticalMargin * 2
)) || 0
height: !text ? DialogStyle.description.verticalMargin : undefined
implicitHeight: text
? description.implicitHeight + DialogStyle.description.verticalMargin * 2
: 0
Text {
id: description
......@@ -20,6 +20,7 @@ Item {
anchors.fill: parent
anchors.leftMargin: DialogStyle.leftMargin
anchors.rightMargin: DialogStyle.rightMargin
color: DialogStyle.description.color
font.pointSize: DialogStyle.description.fontSize
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
......
......@@ -56,9 +56,13 @@ Window {
Row {
id: buttons
Layout.alignment: (centeredButtons && Qt.AlignHCenter) || Qt.AlignLeft
Layout.alignment: centeredButtons
? Qt.AlignHCenter
: Qt.AlignLeft
Layout.bottomMargin: DialogStyle.buttons.bottomMargin
Layout.leftMargin: (!centeredButtons && DialogStyle.leftMargin) || undefined
Layout.leftMargin: !centeredButtons
? DialogStyle.leftMargin
: undefined
Layout.topMargin: DialogStyle.buttons.topMargin
spacing: DialogStyle.buttons.spacing
}
......
pragma Singleton
import QtQuick 2.7
import Linphone 1.0
QtObject {
property int leftMargin: 50
property int rightMargin: 50
......@@ -19,5 +21,6 @@ QtObject {
property QtObject description: QtObject {
property int fontSize: 12
property int verticalMargin: 25
property string color: Constants.colors.l
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment