From 70c0adb8e5f94054cdb6e6b3d1d802918d981018 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Wed, 10 Dec 2025 22:38:07 +0100 Subject: [PATCH] waffles: make calendar spacing more accurate --- .../quickshell/ii/modules/common/widgets/CalendarView.qml | 7 ++++--- .../modules/waffle/notificationCenter/CalendarWidget.qml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dots/.config/quickshell/ii/modules/common/widgets/CalendarView.qml b/dots/.config/quickshell/ii/modules/common/widgets/CalendarView.qml index 648da466a..0e1bd13fc 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/CalendarView.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/CalendarView.qml @@ -87,7 +87,8 @@ Item { property real verticalPadding: 0 property real buttonSize: 40 property real buttonSpacing: 2 - implicitHeight: (6 * buttonSize) + (5 * buttonSpacing) + (2 * verticalPadding) + property real buttonVerticalSpacing: buttonSpacing + implicitHeight: (6 * buttonSize) + (5 * buttonVerticalSpacing) + (2 * verticalPadding) implicitWidth: weeksColumn.implicitWidth clip: true @@ -98,13 +99,13 @@ Item { right: parent.right } y: { - const spacePerExtraRow = root.buttonSize + root.buttonSpacing; + const spacePerExtraRow = root.buttonSize + root.buttonVerticalSpacing; const origin = -(spacePerExtraRow * root.paddingWeeks); const diff = root.weekDiff * spacePerExtraRow; return origin + (-diff % spacePerExtraRow) + root.verticalPadding; } - spacing: root.buttonSpacing + spacing: root.buttonVerticalSpacing Repeater { model: root.totalWeeks diff --git a/dots/.config/quickshell/ii/modules/waffle/notificationCenter/CalendarWidget.qml b/dots/.config/quickshell/ii/modules/waffle/notificationCenter/CalendarWidget.qml index 0ac48d13b..7c01a0b01 100644 --- a/dots/.config/quickshell/ii/modules/waffle/notificationCenter/CalendarWidget.qml +++ b/dots/.config/quickshell/ii/modules/waffle/notificationCenter/CalendarWidget.qml @@ -67,7 +67,8 @@ BodyRectangle { locale: root.locale verticalPadding: 2 buttonSize: 41 // ??? - buttonSpacing: 1 + buttonSpacing: 6 + buttonVerticalSpacing: 1 Layout.fillWidth: true delegate: DayButton {} } @@ -90,7 +91,7 @@ BodyRectangle { anchors.centerIn: parent text: dayButton.model.day color: dayButton.fgColor - font.pixelSize: Looks.font.pixelSize.large + font.pixelSize: Looks.font.pixelSize.larger } } }