From 3f57c6dab7b5386ec2f86615281870faf3cc55e2 Mon Sep 17 00:00:00 2001 From: purian23 Date: Tue, 19 Aug 2025 20:19:23 -0400 Subject: [PATCH] Update keyboard nav icons & tweak notification animations --- Modals/ClipboardHistoryModal.qml | 2 +- .../Center/NotificationCenterPopout.qml | 11 +++++----- .../Center/NotificationHeader.qml | 22 +++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Modals/ClipboardHistoryModal.qml b/Modals/ClipboardHistoryModal.qml index 7be7350d..9a170625 100644 --- a/Modals/ClipboardHistoryModal.qml +++ b/Modals/ClipboardHistoryModal.qml @@ -513,7 +513,7 @@ DankModal { spacing: Theme.spacingS DankActionButton { - iconName: "help" + iconName: "info" iconSize: Theme.iconSize - 4 iconColor: showKeyboardHints ? Theme.primary : Theme.surfaceText hoverColor: Theme.primaryHover diff --git a/Modules/Notifications/Center/NotificationCenterPopout.qml b/Modules/Notifications/Center/NotificationCenterPopout.qml index 4790dd90..4f1c53d5 100644 --- a/Modules/Notifications/Center/NotificationCenterPopout.qml +++ b/Modules/Notifications/Center/NotificationCenterPopout.qml @@ -101,10 +101,11 @@ DankPopout { id: notificationContent property var externalKeyboardController: null + property real cachedHeaderHeight: 32 implicitHeight: { let baseHeight = Theme.spacingL * 2 - baseHeight += notificationHeader.height + baseHeight += cachedHeaderHeight baseHeight += (notificationSettings.expanded ? notificationSettings.contentHeight : 0) baseHeight += Theme.spacingM * 2 let listHeight = notificationList.listContentHeight @@ -162,6 +163,7 @@ DankPopout { NotificationHeader { id: notificationHeader objectName: "notificationHeader" + onHeightChanged: notificationContent.cachedHeaderHeight = height } NotificationSettings { @@ -174,7 +176,7 @@ DankPopout { objectName: "notificationList" width: parent.width - height: parent.height - notificationHeader.height - notificationSettings.height - contentColumnInner.spacing * 2 + height: parent.height - notificationContent.cachedHeaderHeight - notificationSettings.height - contentColumnInner.spacing * 2 } } } @@ -191,9 +193,8 @@ DankPopout { Behavior on implicitHeight { NumberAnimation { - duration: Anims.durShort - easing.type: Easing.BezierSpline - easing.bezierCurve: Anims.emphasized + duration: 180 + easing.type: Easing.OutQuart } } } diff --git a/Modules/Notifications/Center/NotificationHeader.qml b/Modules/Notifications/Center/NotificationHeader.qml index 1784d99c..4785ad97 100644 --- a/Modules/Notifications/Center/NotificationHeader.qml +++ b/Modules/Notifications/Center/NotificationHeader.qml @@ -76,20 +76,10 @@ Item { anchors.verticalCenter: parent.verticalCenter spacing: Theme.spacingXS - // Settings button - DankActionButton { - id: settingsButton - iconName: "settings" - iconColor: root.showSettings ? Theme.primary : Theme.surfaceText - buttonSize: 28 - anchors.verticalCenter: parent.verticalCenter - onClicked: root.showSettings = !root.showSettings - } - // Keyboard help button DankActionButton { id: helpButton - iconName: "help" + iconName: "info" iconColor: keyboardController && keyboardController.showKeyboardHints ? Theme.primary : Theme.surfaceText buttonSize: 28 visible: keyboardController !== null @@ -101,6 +91,16 @@ Item { } } + // Settings button + DankActionButton { + id: settingsButton + iconName: "settings" + iconColor: root.showSettings ? Theme.primary : Theme.surfaceText + buttonSize: 28 + anchors.verticalCenter: parent.verticalCenter + onClicked: root.showSettings = !root.showSettings + } + Rectangle { id: clearAllButton