Use Style.spacingXXXl for spacing AND margins (removed Style.marginXXX)
This commit is contained in:
parent
197bd58661
commit
1e0057dcaf
7 changed files with 26 additions and 33 deletions
|
|
@ -15,7 +15,7 @@ PopupWindow {
|
|||
property real anchorY
|
||||
|
||||
implicitWidth: 180 * scaling
|
||||
implicitHeight: Math.max(40 * scaling, listView.contentHeight + (Style.spacingMedium * 2 * scaling))
|
||||
implicitHeight: Math.max(40 * scaling, listView.contentHeight + (Style.marginMedium * 2 * scaling))
|
||||
visible: false
|
||||
color: "transparent"
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ PopupWindow {
|
|||
ListView {
|
||||
id: listView
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.spacingMedium * scaling
|
||||
anchors.margins: Style.marginMedium * scaling
|
||||
spacing: 0
|
||||
interactive: false
|
||||
enabled: trayMenu.visible
|
||||
|
|
@ -318,8 +318,8 @@ PopupWindow {
|
|||
ListView {
|
||||
id: listView
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.spacingSmall * scaling
|
||||
spacing: Style.spacingTiny * scaling
|
||||
anchors.margins: Style.marginSmall * scaling
|
||||
spacing: Style.marginTiny * scaling
|
||||
interactive: false
|
||||
enabled: subMenu.visible
|
||||
clip: true
|
||||
|
|
@ -354,9 +354,9 @@ PopupWindow {
|
|||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: Style.spacingMedium * scaling
|
||||
anchors.rightMargin: Style.spacingMedium * scaling
|
||||
spacing: Style.spacingSmall * scaling
|
||||
anchors.leftMargin: Style.marginMedium * scaling
|
||||
anchors.rightMargin: Style.marginMedium * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
|
||||
NText {
|
||||
id: subText
|
||||
|
|
|
|||
|
|
@ -237,8 +237,8 @@ NLoader {
|
|||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.spacingSmall * scaling
|
||||
spacing: Style.spacingSmall * scaling
|
||||
anchors.margins: Style.marginSmall * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
|
|
@ -254,7 +254,7 @@ NLoader {
|
|||
TextInput {
|
||||
id: passwordInputField
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.spacingMedium * scaling
|
||||
anchors.margins: Style.marginMedium * scaling
|
||||
text: passwordInput
|
||||
font.pointSize: Style.fontSizeMedium * scaling
|
||||
color: Colors.textPrimary
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ NLoader {
|
|||
Column {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.marginSmall * scaling
|
||||
spacing: Style.spacingTiny * 1.5 * scaling // Minimal spacing between tabs
|
||||
spacing: Style.marginTiny * 1.5 * scaling // Minimal spacing between tabs
|
||||
|
||||
Repeater {
|
||||
id: sections
|
||||
|
|
@ -132,7 +132,7 @@ NLoader {
|
|||
NText {
|
||||
text: modelData.label
|
||||
color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textPrimary)
|
||||
font.pointSize: Style.fontSizeMediumLarge * scaling
|
||||
font.pointSize: Style.fontSizeInter * scaling
|
||||
font.weight: Style.fontWeightBold
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ NLoader {
|
|||
|
||||
readonly property real scaling: Scaling.scale(screen)
|
||||
// Single source of truth for spacing between cards (both axes)
|
||||
property real cardSpacing: Style.spacingLarge * scaling
|
||||
property real cardSpacing: Style.marginLarge * scaling
|
||||
// X coordinate from the bar to align this panel under
|
||||
property real anchorX: root.anchorX
|
||||
// Ensure this panel attaches to the intended screen
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ NBox {
|
|||
model: weatherReady ? Location.data.weather.daily.time : []
|
||||
delegate: ColumnLayout {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
spacing: Style.spacingSmall * scaling
|
||||
spacing: Style.marginSmall * scaling
|
||||
NText {
|
||||
text: Qt.formatDateTime(new Date(Location.data.weather.daily.time[index]), "ddd")
|
||||
color: Colors.textPrimary
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue