X-Git-Url: https://www.flypig.org.uk/git/?p=harbour-pedalo.git;a=blobdiff_plain;f=qml%2Fpages%2FJourneyEdit.qml;h=a0d4349df5d97fab273780f0cd7c856086755285;hp=1f61b391dacefd1982a384be3db974219c0155db;hb=5fc520bad80dccf9bf2e0f16552c9f2605417067;hpb=c0284f613fd20fdedc5ef60de9893c74601ede6d

diff --git a/qml/pages/JourneyEdit.qml b/qml/pages/JourneyEdit.qml
index 1f61b39..a0d4349 100644
--- a/qml/pages/JourneyEdit.qml
+++ b/qml/pages/JourneyEdit.qml
@@ -31,18 +31,23 @@ Dialog {
     SilicaFlickable {
         id: journeyEditView
         anchors.fill: parent
-        contentHeight: journeyEditColumn.implicitHeight
+        contentHeight: headerItem.height + Theme.paddingLarge + (isPortrait ?
+                           (journeyEditColumnFirst.implicitHeight + journeyEditColumnSecond.implicitHeight) :
+                           Math.max(journeyEditColumnFirst.implicitHeight, journeyEditColumnSecond.implicitHeight))
 
         VerticalScrollDecorator {}
 
+        DialogHeader {
+            id: headerItem
+            title: journeyEditDialog.title
+        }
+
         Column {
-            id: journeyEditColumn
+            id: journeyEditColumnFirst
             spacing: Theme.paddingMedium
-            width: parent.width
-
-            DialogHeader {
-                title: journeyEditDialog.title
-            }
+            width: isPortrait ? parent.width : (parent.width * 0.5)
+            x: 0
+            y: headerItem.height
 
             ValueButton {
                 id: startDate
@@ -101,6 +106,14 @@ Dialog {
                     })
                 }
             }
+        }
+
+        Column {
+            id: journeyEditColumnSecond
+            spacing: Theme.paddingMedium
+            width: isPortrait ? parent.width : (parent.width * 0.5)
+            x: isPortrait ? 0 : (parent.width * 0.5)
+            y: isPortrait ? journeyEditColumnFirst.y + journeyEditColumnFirst.height + Theme.paddingLarge : journeyEditColumnFirst.y
 
             TextField {
                 id: faster
@@ -122,10 +135,11 @@ Dialog {
                 placeholderText: label
                 text: overtakenby >= 0 ? "" + overtakenby : ""
                 horizontalAlignment: TextInput.AlignLeft
-                EnterKey.iconSource: "image://theme/icon-m-enter-next"
+                EnterKey.iconSource: "image://theme/icon-m-enter-accept"
                 EnterKey.onClicked: journeyEditDialog.accept()
             }
         }
+
     }
 
     onAccepted: {