From 6953250e50954a8b6ba202e01ca559aecdda5dd4 Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 30 Aug 2019 18:10:25 -0400 Subject: [PATCH] Adjust padding for Buttons, TextFields, TextAreas --- src/qml/Base/HButton.qml | 5 +++-- src/qml/Base/HScrollableTextArea.qml | 5 +++++ src/qml/Base/HTextField.qml | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qml/Base/HButton.qml b/src/qml/Base/HButton.qml index bca772fa..20225ad5 100644 --- a/src/qml/Base/HButton.qml +++ b/src/qml/Base/HButton.qml @@ -5,10 +5,11 @@ import QtQuick.Layouts 1.12 Button { id: button spacing: theme.spacing - leftPadding: spacing / 1.5 + leftPadding: spacing / (circle ? 1.5 : 1) rightPadding: leftPadding - topPadding: spacing / 2 + topPadding: spacing / (circle ? 1.75 : 1.5) bottomPadding: topPadding + iconItem.svgName: loading ? "hourglass" : icon.name icon.color: theme.icons.colorize enabled: ! loading diff --git a/src/qml/Base/HScrollableTextArea.qml b/src/qml/Base/HScrollableTextArea.qml index aa1ad271..a25227d0 100644 --- a/src/qml/Base/HScrollableTextArea.qml +++ b/src/qml/Base/HScrollableTextArea.qml @@ -14,6 +14,11 @@ ScrollView { TextArea { id: textArea + leftPadding: theme.spacing + rightPadding: leftPadding + topPadding: theme.spacing / 1.5 + bottomPadding: topPadding + readOnly: ! visible selectByMouse: true diff --git a/src/qml/Base/HTextField.qml b/src/qml/Base/HTextField.qml index 8a482f84..88ae0715 100644 --- a/src/qml/Base/HTextField.qml +++ b/src/qml/Base/HTextField.qml @@ -3,6 +3,11 @@ import QtQuick.Controls 2.12 TextField { id: field + leftPadding: theme.spacing + rightPadding: leftPadding + topPadding: theme.spacing / 1.5 + bottomPadding: topPadding + font.family: theme.fontFamily.sans font.pixelSize: theme.fontSize.normal font.pointSize: -1