add spacing

MerginMaps · Mar 22, 2021 · dd63a2b · dd63a2b · inputapp-bot · Mar 22, 2021
1 parent ac412b8
commit dd63a2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/qml/FeaturePanel.qml b/app/qml/FeaturePanel.qml
@@ -221,7 +221,7 @@ Drawer {
                   property real bottomMargin: 1 * QgsQuick.Utils.dp
                   property real height: 64 * QgsQuick.Utils.dp
                   property color fontColor: InputStyle.fontColor
-                  property int spacing: 0
+                  property int spacing: InputStyle.formSpacing
                   property int fontPixelSize: 24 * QgsQuick.Utils.dp
                 }
 

diff --git a/app/qml/InputStyle.qml b/app/qml/InputStyle.qml
@@ -58,6 +58,7 @@ QtObject {
     property real cornerRadius: 8 * QgsQuick.Utils.dp
     property real innerFieldMargin: 10 * QgsQuick.Utils.dp  // TODO rename fieldMargin
     property real outerFieldMargin: 20 * QgsQuick.Utils.dp  // TODO change for PanelMargin
+    property real formSpacing: 10 * QgsQuick.Utils.dp
 
     property real refWidth: 640
     property real refHeight: 1136

diff --git a/qgsquick/from_qgis/plugin/qgsquickfeatureform.qml b/qgsquick/from_qgis/plugin/qgsquickfeatureform.qml
@@ -374,13 +374,13 @@ Item {
               Item {
                 id: headerContainer
                 width: parent.width
-                height: section === "" ? 0 : form.style.group.height + 2 * form.style.fields.sideMargin // fields use sideMargin twice for top margin
+                height: section === "" ? 0 : form.style.group.height + form.style.group.spacing // add space after section header
 
                 Rectangle {
                   width: parent.width
                   height: section === "" ? 0 : form.style.group.height
                   color: form.style.group.marginColor
-                  anchors.bottom: parent.bottom
+                  anchors.top: parent.top
 
                   Rectangle {
                     anchors.fill: parent
@@ -417,9 +417,9 @@ Item {
 
             delegate: fieldItem
 
-            footer: Rectangle {
+            header: Rectangle {
               opacity: 1
-              height: 15 * QgsQuick.Utils.dp
+              height: form.style.group.spacing
             }
           }
         }
@@ -465,7 +465,7 @@ Item {
 
       Item {
         id: labelPlaceholder
-        height: fieldLabel.height + constraintDescriptionLabel.height + 2 * form.style.fields.sideMargin
+        height: fieldLabel.height + constraintDescriptionLabel.height + form.style.fields.sideMargin
         anchors {
           left: parent.left
           right: parent.right
@@ -482,7 +482,6 @@ Item {
           font.pointSize: form.style.fields.labelPointSize
           horizontalAlignment: Text.AlignLeft
           verticalAlignment: Text.AlignVCenter
-          anchors.topMargin: form.style.fields.sideMargin
           anchors.top: parent.top
         }