mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-06 13:35:36 -05:00
Update keyboard nav icons & tweak notification animations
This commit is contained in:
@@ -513,7 +513,7 @@ DankModal {
|
|||||||
spacing: Theme.spacingS
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
DankActionButton {
|
DankActionButton {
|
||||||
iconName: "help"
|
iconName: "info"
|
||||||
iconSize: Theme.iconSize - 4
|
iconSize: Theme.iconSize - 4
|
||||||
iconColor: showKeyboardHints ? Theme.primary : Theme.surfaceText
|
iconColor: showKeyboardHints ? Theme.primary : Theme.surfaceText
|
||||||
hoverColor: Theme.primaryHover
|
hoverColor: Theme.primaryHover
|
||||||
|
|||||||
@@ -101,10 +101,11 @@ DankPopout {
|
|||||||
id: notificationContent
|
id: notificationContent
|
||||||
|
|
||||||
property var externalKeyboardController: null
|
property var externalKeyboardController: null
|
||||||
|
property real cachedHeaderHeight: 32
|
||||||
|
|
||||||
implicitHeight: {
|
implicitHeight: {
|
||||||
let baseHeight = Theme.spacingL * 2
|
let baseHeight = Theme.spacingL * 2
|
||||||
baseHeight += notificationHeader.height
|
baseHeight += cachedHeaderHeight
|
||||||
baseHeight += (notificationSettings.expanded ? notificationSettings.contentHeight : 0)
|
baseHeight += (notificationSettings.expanded ? notificationSettings.contentHeight : 0)
|
||||||
baseHeight += Theme.spacingM * 2
|
baseHeight += Theme.spacingM * 2
|
||||||
let listHeight = notificationList.listContentHeight
|
let listHeight = notificationList.listContentHeight
|
||||||
@@ -162,6 +163,7 @@ DankPopout {
|
|||||||
NotificationHeader {
|
NotificationHeader {
|
||||||
id: notificationHeader
|
id: notificationHeader
|
||||||
objectName: "notificationHeader"
|
objectName: "notificationHeader"
|
||||||
|
onHeightChanged: notificationContent.cachedHeaderHeight = height
|
||||||
}
|
}
|
||||||
|
|
||||||
NotificationSettings {
|
NotificationSettings {
|
||||||
@@ -174,7 +176,7 @@ DankPopout {
|
|||||||
objectName: "notificationList"
|
objectName: "notificationList"
|
||||||
|
|
||||||
width: parent.width
|
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 {
|
Behavior on implicitHeight {
|
||||||
NumberAnimation {
|
NumberAnimation {
|
||||||
duration: Anims.durShort
|
duration: 180
|
||||||
easing.type: Easing.BezierSpline
|
easing.type: Easing.OutQuart
|
||||||
easing.bezierCurve: Anims.emphasized
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,20 +76,10 @@ Item {
|
|||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
spacing: Theme.spacingXS
|
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
|
// Keyboard help button
|
||||||
DankActionButton {
|
DankActionButton {
|
||||||
id: helpButton
|
id: helpButton
|
||||||
iconName: "help"
|
iconName: "info"
|
||||||
iconColor: keyboardController && keyboardController.showKeyboardHints ? Theme.primary : Theme.surfaceText
|
iconColor: keyboardController && keyboardController.showKeyboardHints ? Theme.primary : Theme.surfaceText
|
||||||
buttonSize: 28
|
buttonSize: 28
|
||||||
visible: keyboardController !== null
|
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 {
|
Rectangle {
|
||||||
id: clearAllButton
|
id: clearAllButton
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user