Fix DPI issue with DiscardOrKeepProfileChangesDialog

This commit is contained in:
Lipu Fei 2017-05-09 11:47:55 +02:00
parent 7632b9df79
commit 36dedabd11

View File

@ -36,9 +36,14 @@ UM.Dialog
} }
} }
Column Row
{ {
anchors.fill: parent id: infoTextRow
height: childrenRect.height
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
UM.I18nCatalog UM.I18nCatalog
@ -47,14 +52,6 @@ UM.Dialog
name: "cura" name: "cura"
} }
Row
{
height: childrenRect.height
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.right: parent.right
spacing: UM.Theme.getSize("default_margin").width
Label Label
{ {
text: catalog.i18nc("@text:window", "You have customized some profile settings.\nWould you like to keep or discard those settings?") text: catalog.i18nc("@text:window", "You have customized some profile settings.\nWould you like to keep or discard those settings?")
@ -64,11 +61,16 @@ UM.Dialog
} }
} }
TableView Item
{ {
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
anchors.top: infoTextRow.bottom
anchors.bottom: optionRow.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
TableView
{
anchors.fill: parent
height: base.height - 150 * Screen.devicePixelRatio height: base.height - 150 * Screen.devicePixelRatio
id: tableView id: tableView
Component Component
@ -132,9 +134,12 @@ UM.Dialog
model: base.changesModel model: base.changesModel
} }
}
Item Item
{ {
id: optionRow
anchors.bottom: buttonsRow.top
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
@ -179,6 +184,8 @@ UM.Dialog
Item Item
{ {
id: buttonsRow
anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
@ -220,4 +227,3 @@ UM.Dialog
} }
} }
} }
}