mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-09-10 12:03:18 +02:00
tips: title should not go outside the box
Change-Id: I28ed5573adb50b4372f4b763d3565eefeb00ae35 GitLab: #1018
This commit is contained in:
parent
06ddff4584
commit
5e106ea665
3 changed files with 34 additions and 21 deletions
|
@ -31,6 +31,10 @@ Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: backupLayout.height
|
height: backupLayout.height
|
||||||
|
|
||||||
|
property var iconSize: 26
|
||||||
|
property var margin: 5
|
||||||
|
property var prefWidth: 170
|
||||||
|
|
||||||
signal ignore
|
signal ignore
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
@ -50,9 +54,9 @@ Item {
|
||||||
visible: !opened
|
visible: !opened
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: root.margin
|
||||||
Layout.preferredWidth: 26
|
Layout.preferredWidth: root.iconSize
|
||||||
Layout.preferredHeight: 26
|
Layout.preferredHeight: root.iconSize
|
||||||
|
|
||||||
containerHeight: Layout.preferredHeight
|
containerHeight: Layout.preferredHeight
|
||||||
containerWidth: Layout.preferredWidth
|
containerWidth: Layout.preferredWidth
|
||||||
|
@ -61,21 +65,22 @@ Item {
|
||||||
color: JamiTheme.buttonTintedBlue
|
color: JamiTheme.buttonTintedBlue
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Text {
|
||||||
text: JamiStrings.backupAccountBtn
|
text: JamiStrings.backupAccountBtn
|
||||||
color: JamiTheme.textColor
|
color: JamiTheme.textColor
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: root.margin
|
||||||
visible: !opened
|
visible: !opened
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.leftMargin: 5
|
Layout.leftMargin: root.margin
|
||||||
|
Layout.preferredWidth: root.prefWidth - 2 * root.margin - root.iconSize
|
||||||
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
||||||
|
elide: Qt.ElideRight
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
Layout.preferredWidth: root.prefWidth
|
||||||
Layout.preferredWidth: 170
|
|
||||||
Layout.leftMargin: 20
|
Layout.leftMargin: 20
|
||||||
Layout.topMargin: 8
|
Layout.topMargin: 8
|
||||||
Layout.bottomMargin: 15
|
Layout.bottomMargin: 15
|
||||||
|
|
|
@ -26,9 +26,12 @@ import net.jami.Constants 1.1
|
||||||
import "../../commoncomponents"
|
import "../../commoncomponents"
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
id: column
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
|
property var iconSize: 26
|
||||||
|
property var margin: 5
|
||||||
|
property var prefWidth: 170
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
||||||
|
@ -41,9 +44,9 @@ ColumnLayout {
|
||||||
visible: !opened
|
visible: !opened
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: column.margin
|
||||||
Layout.preferredWidth: 26
|
Layout.preferredWidth: column.iconSize
|
||||||
Layout.preferredHeight: 26
|
Layout.preferredHeight: column.iconSize
|
||||||
|
|
||||||
containerHeight: Layout.preferredHeight
|
containerHeight: Layout.preferredHeight
|
||||||
containerWidth: Layout.preferredWidth
|
containerWidth: Layout.preferredWidth
|
||||||
|
@ -56,16 +59,17 @@ ColumnLayout {
|
||||||
text: JamiStrings.customize
|
text: JamiStrings.customize
|
||||||
color: JamiTheme.textColor
|
color: JamiTheme.textColor
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: column.margin
|
||||||
|
Layout.preferredWidth: column.prefWidth - 2 * column.margin - column.iconSize
|
||||||
visible: !opened
|
visible: !opened
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.leftMargin: 5
|
Layout.leftMargin: column.margin
|
||||||
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
||||||
|
elide: Qt.ElideRight
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
||||||
Layout.preferredWidth: 170
|
Layout.preferredWidth: 170
|
||||||
Layout.leftMargin: 20
|
Layout.leftMargin: 20
|
||||||
Layout.topMargin: 8
|
Layout.topMargin: 8
|
||||||
|
|
|
@ -27,9 +27,12 @@ import "../../commoncomponents"
|
||||||
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
id: column
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
|
property var iconSize: 26
|
||||||
|
property var margin: 5
|
||||||
|
property var prefWidth: 170
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
||||||
|
@ -42,9 +45,9 @@ ColumnLayout {
|
||||||
visible: !opened
|
visible: !opened
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: column.margin
|
||||||
Layout.preferredWidth: 26
|
Layout.preferredWidth: column.iconSize
|
||||||
Layout.preferredHeight: 26
|
Layout.preferredHeight: column.iconSize
|
||||||
|
|
||||||
containerHeight: Layout.preferredHeight
|
containerHeight: Layout.preferredHeight
|
||||||
containerWidth: Layout.preferredWidth
|
containerWidth: Layout.preferredWidth
|
||||||
|
@ -57,16 +60,17 @@ ColumnLayout {
|
||||||
text: JamiStrings.tip
|
text: JamiStrings.tip
|
||||||
color: JamiTheme.textColor
|
color: JamiTheme.textColor
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: column.margin
|
||||||
visible: !opened
|
visible: !opened
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
Layout.leftMargin: 8
|
Layout.leftMargin: 8
|
||||||
|
Layout.preferredWidth: column.prefWidth - 2 * column.margin - column.iconSize
|
||||||
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
font.pixelSize: JamiTheme.tipBoxTitleFontSize
|
||||||
|
elide: Qt.ElideRight
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
||||||
Layout.preferredWidth: opened ? 140 : 150
|
Layout.preferredWidth: opened ? 140 : 150
|
||||||
Layout.leftMargin: 20
|
Layout.leftMargin: 20
|
||||||
Layout.topMargin: opened ? 0 : 8
|
Layout.topMargin: opened ? 0 : 8
|
||||||
|
|
Loading…
Add table
Reference in a new issue