Allow enter to be used to confirm canvas/image size dialogs

mitchcurtis · Jan 26, 2019 · 7d3bdb7 · 7d3bdb7
1 parent 102161a
commit 7d3bdb7
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 53 deletions.
diff --git a/app/qml/ui/CanvasSizePopup.qml b/app/qml/ui/CanvasSizePopup.qml
@@ -24,7 +24,7 @@ import QtQuick.Controls 2.3
 import App 1.0
 
 Dialog {
-    id: popup
+    id: root
     objectName: "canvasSizePopup"
     title: qsTr("Choose a size for the canvas")
     modal: true
@@ -45,6 +45,8 @@ Dialog {
 
     onClosed: canvas.forceActiveFocus()
 
+    onAccepted: project.size = Qt.size(widthSpinBox.value, heightSpinBox.value)
+
     contentItem: ColumnLayout {
         Item {
             Layout.preferredHeight: 4
@@ -65,10 +67,12 @@ Dialog {
                 editable: true
                 stepSize: 1
 
-                ToolTip.text: isTilesetProject ? tilesetText : imageText
-
                 readonly property string tilesetText: qsTr("Number of horizontal tiles")
                 readonly property string imageText: qsTr("Canvas width in pixels")
+
+                ToolTip.text: isTilesetProject ? tilesetText : imageText
+
+                Keys.onReturnPressed: root.accept()
             }
             Label {
                 text: qsTr("Canvas height")
@@ -82,10 +86,12 @@ Dialog {
                 editable: true
                 stepSize: 1
 
-                ToolTip.text: isTilesetProject ? tilesetText : imageText
-
                 readonly property string tilesetText: qsTr("Number of vertical tiles")
                 readonly property string imageText: qsTr("Canvas height in pixels")
+
+                ToolTip.text: isTilesetProject ? tilesetText : imageText
+
+                Keys.onReturnPressed: root.accept()
             }
 
             Item {
@@ -97,23 +103,19 @@ Dialog {
 
     footer: DialogButtonBox {
         Button {
+            id: okButton
             objectName: "canvasSizePopupOkButton"
-            text: "OK"
+            text: qsTr("OK")
 
             DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
-
-            onClicked: {
-                project.size = Qt.size(widthSpinBox.value, heightSpinBox.value);
-                popup.visible = false;
-            }
         }
         Button {
             objectName: "canvasSizePopupCancelButton"
-            text: "Cancel"
-
-            DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
+            text: qsTr("Cancel")
 
-            onClicked: popup.visible = false
+            // https://bugreports.qt.io/browse/QTBUG-67168
+            // TODO: replace this with DestructiveRole when it works (closes dialog)
+            DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
         }
     }
 }
diff --git a/app/qml/ui/ImageSizePopup.qml b/app/qml/ui/ImageSizePopup.qml
@@ -24,7 +24,7 @@ import QtQuick.Controls 2.3
 import App 1.0
 
 Dialog {
-    id: dialog
+    id: root
     objectName: "imageSizePopup"
     title: qsTr("Choose a size for the image")
     modal: true
@@ -42,6 +42,8 @@ Dialog {
         }
     }
 
+    onAccepted: project.resize(widthSpinBox.value, heightSpinBox.value, smoothCheckBox.checked)
+
     contentItem: ColumnLayout {
         Item {
             Layout.preferredHeight: 4
@@ -123,6 +125,8 @@ Dialog {
 
                 ToolTip.text: qsTr("Image width in pixels")
 
+                Keys.onReturnPressed: root.accept()
+
                 onValueModified: valueUpdated(value)
 
                 // https://bugreports.qt.io/browse/QTBUG-64151
@@ -158,6 +162,8 @@ Dialog {
 
                 ToolTip.text: qsTr("Image height in pixels")
 
+                Keys.onReturnPressed: root.accept()
+
                 onValueModified: valueUpdated(value)
 
                 // https://bugreports.qt.io/browse/QTBUG-64151
@@ -199,46 +205,22 @@ Dialog {
                 Layout.fillHeight: true
             }
         }
+    }
 
-        RowLayout {
-            Button {
-                objectName: "imageSizePopupOkButton"
-                text: qsTr("OK")
+    footer: DialogButtonBox {
+        Button {
+            objectName: "imageSizePopupOkButton"
+            text: qsTr("OK")
 
-                onClicked: {
-                    project.resize(widthSpinBox.value, heightSpinBox.value, smoothCheckBox.checked);
-                    dialog.visible = false;
-                }
-            }
-            Button {
-                objectName: "imageSizePopupCancelButton"
-                text: qsTr("Cancel")
+            DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
+        }
+        Button {
+            objectName: "imageSizePopupCancelButton"
+            text: qsTr("Cancel")
 
-                onClicked: dialog.visible = false
-            }
+            // https://bugreports.qt.io/browse/QTBUG-67168
+            // TODO: replace this with DestructiveRole when it works (closes dialog)
+            DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
         }
     }
-
-    // https://bugreports.qt.io/browse/QTBUG-64174
-//    footer: DialogButtonBox {
-//        Button {
-//            objectName: "imageSizePopupOkButton"
-//            text: qsTr("OK")
-
-//            DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
-
-//            onClicked: {
-//                project.resize(widthSpinBox.value, heightSpinBox.value, smoothCheckBox.checked);
-//                dialog.visible = false;
-//            }
-//        }
-//        Button {
-//            objectName: "imageSizePopupCancelButton"
-//            text: qsTr("Cancel")
-
-//            DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
-
-//            onClicked: dialog.visible = false
-//        }
-//    }
 }