From 8d1d6be7011b11d14b2e38d65a486a8b9b5822bc Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Tue, 3 Nov 2020 11:38:37 -0400
Subject: [PATCH] Notifications.qml: improve paddings consistency

---
 src/gui/Pages/AccountSettings/NotificationRuleDelegate.qml | 6 ++++++
 src/gui/Pages/AccountSettings/Notifications.qml            | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gui/Pages/AccountSettings/NotificationRuleDelegate.qml b/src/gui/Pages/AccountSettings/NotificationRuleDelegate.qml
index b11db0ce..3f11053e 100644
--- a/src/gui/Pages/AccountSettings/NotificationRuleDelegate.qml
+++ b/src/gui/Pages/AccountSettings/NotificationRuleDelegate.qml
@@ -20,6 +20,8 @@ HTile {
 
     contentOpacity: model.enabled ? 1 : theme.disabledElementsOpacity
     hoverEnabled: false
+    leftPadding: theme.spacing / 4
+    rightPadding: leftPadding
 
     contentItem: HColumnLayout {
         spacing: root.spacing / 2
@@ -95,10 +97,13 @@ HTile {
                 model.rule_id
 
             Layout.fillWidth: true
+            Layout.leftMargin: theme.spacing
+            Layout.rightMargin: Layout.leftMargin
         }
 
         HRowLayout {
             NotificationRuleButton {
+                id: notifyButton
                 toggles: "notify"
 
                 contentItem: MessageIndicator {
@@ -113,6 +118,7 @@ HTile {
             }
 
             NotificationRuleButton {
+                enabled: notifyButton.on
                 toggles: "highlight"
 
                 contentItem: MessageIndicator {
diff --git a/src/gui/Pages/AccountSettings/Notifications.qml b/src/gui/Pages/AccountSettings/Notifications.qml
index 4e7f0da3..e3484e49 100644
--- a/src/gui/Pages/AccountSettings/Notifications.qml
+++ b/src/gui/Pages/AccountSettings/Notifications.qml
@@ -54,7 +54,6 @@ HListView {
     section.property: "kind"
     section.delegate: HLabel {
         width: root.width
-        topPadding: padding * (section === "override" ? 1 : 1.5)
         padding: theme.spacing
         font.pixelSize: theme.fontSize.big
         text:
@@ -78,10 +77,14 @@ HListView {
         ApplyButton {
             onClicked: root.save()
             loading: root.saveFutureId !== ""
+
+            Layout.topMargin: theme.spacing
         }
 
         CancelButton {
             onClicked: pendingEdits = {}
+
+            Layout.topMargin: theme.spacing
         }
     }