1 files changed, 13 insertions, 16 deletions
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml
index 35df6362..eee9b88d 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/imports/controls/material/DialogButtonBox.qml
@@ -34,35 +34,32 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.11
-import QtQuick.Templates 2.4 as T
-import QtQuick.Controls 2.4
-import QtQuick.Controls.impl 2.4
-import QtQuick.Controls.Material 2.4
-import QtQuick.Controls.Material.impl 2.4
+import QtQuick 2.12
+import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.5
+import QtQuick.Controls.impl 2.5
+import QtQuick.Controls.Material 2.5
+import QtQuick.Controls.Material.impl 2.5
 
 T.DialogButtonBox {
     id: control
 
-    implicitWidth: Math.max(background ? background.implicitWidth : 0,
-                            contentItem.implicitWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             contentItem.implicitHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            contentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             contentHeight + topPadding + bottomPadding)
 
     spacing: 8
     padding: 8
-    topPadding: 2
-    bottomPadding: 2
+    verticalPadding: 2
     alignment: Qt.AlignRight
+    buttonLayout: T.DialogButtonBox.AndroidLayout
 
     Material.foreground: Material.accent
 
     delegate: Button { flat: true }
 
     contentItem: ListView {
-        implicitWidth: contentWidth
-        implicitHeight: 48
-
         model: control.contentModel
         spacing: control.spacing
         orientation: ListView.Horizontal
@@ -71,7 +68,7 @@ T.DialogButtonBox {
     }
 
     background: PaddedRectangle {
-        implicitHeight: 52
+        implicitHeight: control.Material.dialogButtonBoxHeight
         radius: 2
         color: control.Material.dialogColor
         // Rounded corners should be only at the top or at the bottom