fixed volume popup closing when changing a device + made notifications and volume fonts bolder
This commit is contained in:
SomeElse
@@ -143,6 +143,7 @@ ModuleChip {
|
||||
text: toastRoot.urgencyIcon(toastRoot.urgency)
|
||||
color: toastRoot.urgencyColor(toastRoot.urgency)
|
||||
font.pixelSize: 12
|
||||
font.bold: true
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
@@ -162,6 +163,7 @@ ModuleChip {
|
||||
text: toastRoot.timeStr
|
||||
color: toastRoot.t.notifToastDim
|
||||
font.pixelSize: 11
|
||||
font.bold: true
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
@@ -177,6 +179,7 @@ ModuleChip {
|
||||
text: "✕"
|
||||
color: closeHover.hovered ? toastRoot.t.notifToastText : toastRoot.t.notifToastDim
|
||||
font.pixelSize: 10
|
||||
font.bold: true
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
HoverHandler { id: closeHover; cursorShape: Qt.PointingHandCursor }
|
||||
@@ -200,6 +203,7 @@ ModuleChip {
|
||||
text: toastRoot.body
|
||||
color: toastRoot.t.notifToastDim
|
||||
font.pixelSize: 12
|
||||
font.bold: true
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WordWrap
|
||||
maximumLineCount: 3
|
||||
@@ -251,8 +255,8 @@ ModuleChip {
|
||||
|
||||
signal dismissed(int itemIndex)
|
||||
|
||||
height: histItemContent.implicitHeight + 24
|
||||
radius: 12
|
||||
height: histItemContent.implicitHeight + 16
|
||||
radius: 10
|
||||
clip: true
|
||||
color: histItemHover.hovered ? histRoot.t.notifHistoryHover : "transparent"
|
||||
Behavior on color { ColorAnimation { duration: 150; easing.type: Easing.OutCubic } }
|
||||
@@ -271,48 +275,59 @@ ModuleChip {
|
||||
|
||||
Rectangle {
|
||||
width: 3
|
||||
height: Math.max(12, histRoot.height - 24)
|
||||
height: Math.max(10, histRoot.height - 16)
|
||||
radius: 1.5
|
||||
anchors { left: parent.left; leftMargin: 10; verticalCenter: parent.verticalCenter }
|
||||
anchors { left: parent.left; leftMargin: 8; verticalCenter: parent.verticalCenter }
|
||||
color: histRoot.urgencyColor(histRoot.urgency)
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors { right: parent.right; top: parent.top; margins: 8 }
|
||||
width: 22; height: 22; radius: 11
|
||||
anchors { right: parent.right; top: parent.top; margins: 6 }
|
||||
width: 18; height: 18; radius: 9
|
||||
color: histCloseHover.hovered ? histRoot.t.notifHistoryHover : "transparent"
|
||||
opacity: histItemHover.hovered ? 1 : 0
|
||||
Behavior on opacity { NumberAnimation { duration: 150 } }
|
||||
Behavior on color { ColorAnimation { duration: 150 } }
|
||||
|
||||
Text { anchors.centerIn: parent; text: "✕"; color: histRoot.t.notifToastText; font.pixelSize: 10; renderType: Text.NativeRendering }
|
||||
Text { anchors.centerIn: parent; text: "✕"; color: histRoot.t.notifToastText; font.pixelSize: 10; font.bold: true; renderType: Text.NativeRendering }
|
||||
HoverHandler { id: histCloseHover; cursorShape: Qt.PointingHandCursor }
|
||||
TapHandler { onTapped: dismissAnim.start() }
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors { right: parent.right; rightMargin: 6; top: parent.top; topMargin: 8 }
|
||||
text: histRoot.timeStr
|
||||
color: histRoot.t.notifToastDim
|
||||
font.pixelSize: 10
|
||||
font.bold: true
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
renderType: Text.NativeRendering
|
||||
opacity: histItemHover.hovered ? 0 : 1
|
||||
Behavior on opacity { NumberAnimation { duration: 150 } }
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
id: histItemContent
|
||||
anchors { left: parent.left; right: parent.right; top: parent.top; leftMargin: 24; rightMargin: 36; topMargin: 12 }
|
||||
spacing: 4
|
||||
anchors { left: parent.left; right: parent.right; top: parent.top; leftMargin: 20; rightMargin: 40; topMargin: 8 }
|
||||
spacing: 2
|
||||
|
||||
RowLayout {
|
||||
Layout.fillWidth: true; spacing: 5
|
||||
Text { text: histRoot.urgencyIcon(histRoot.urgency); color: histRoot.urgencyColor(histRoot.urgency); font.pixelSize: 11; Layout.alignment: Qt.AlignVCenter; renderType: Text.NativeRendering }
|
||||
Text { text: histRoot.urgencyIcon(histRoot.urgency); color: histRoot.urgencyColor(histRoot.urgency); font.pixelSize: 10; font.bold: true; Layout.alignment: Qt.AlignVCenter; renderType: Text.NativeRendering }
|
||||
Text {
|
||||
text: histRoot.appName; color: histRoot.t.notifToastAppName; font.pixelSize: 12; font.bold: true
|
||||
text: histRoot.appName; color: histRoot.t.notifToastAppName; font.pixelSize: 11; font.bold: true
|
||||
font.capitalization: Font.AllUppercase; font.letterSpacing: 0.4; Layout.fillWidth: true; elide: Text.ElideRight; verticalAlignment: Text.AlignVCenter
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
Text { text: histRoot.timeStr; color: histRoot.t.notifToastDim; font.pixelSize: 11; verticalAlignment: Text.AlignVCenter; renderType: Text.NativeRendering }
|
||||
}
|
||||
|
||||
Text {
|
||||
text: histRoot.summary; color: histRoot.t.notifToastText; font.pixelSize: 13; font.bold: true
|
||||
text: histRoot.summary; color: histRoot.t.notifToastText; font.pixelSize: 12; font.bold: true
|
||||
Layout.fillWidth: true; elide: Text.ElideRight; textFormat: Text.PlainText; visible: histRoot.summary !== ""
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
Text {
|
||||
text: histRoot.body; color: histRoot.t.notifToastDim; font.pixelSize: 12; Layout.fillWidth: true
|
||||
text: histRoot.body; color: histRoot.t.notifToastDim; font.pixelSize: 11; font.bold: true; Layout.fillWidth: true
|
||||
wrapMode: Text.WordWrap; maximumLineCount: 2; elide: Text.ElideRight; textFormat: Text.PlainText; visible: histRoot.body !== ""; lineHeight: 1.2
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
@@ -344,6 +359,7 @@ ModuleChip {
|
||||
? t.notifDnd
|
||||
: (root.unreadCount > 0 ? t.notifIconActive : t.notifIcon)
|
||||
font.pixelSize: Cfg.Config.notifIconSize
|
||||
font.bold: true
|
||||
Behavior on color { ColorAnimation { duration: 150 } }
|
||||
|
||||
rotation: 0
|
||||
@@ -586,7 +602,7 @@ ModuleChip {
|
||||
anchors.topMargin: 20; anchors.leftMargin: 20; anchors.rightMargin: 20
|
||||
spacing: 10
|
||||
|
||||
Text { text: ""; color: t.notifToastAppName; font.pixelSize: 18; Layout.alignment: Qt.AlignVCenter; renderType: Text.NativeRendering }
|
||||
Text { text: ""; color: t.notifToastAppName; font.pixelSize: 18; font.bold: true; Layout.alignment: Qt.AlignVCenter; renderType: Text.NativeRendering }
|
||||
Text {
|
||||
text: "Notifications"; color: t.notifToastAppName; font.pixelSize: 15; font.bold: true
|
||||
Layout.fillWidth: true; Layout.alignment: Qt.AlignVCenter; renderType: Text.NativeRendering
|
||||
@@ -613,6 +629,7 @@ ModuleChip {
|
||||
text: ""
|
||||
color: root.doNotDisturb ? t.notifDnd : t.notifToastDim
|
||||
font.pixelSize: 12
|
||||
font.bold: true
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
Behavior on color { ColorAnimation { duration: 150 } }
|
||||
renderType: Text.NativeRendering
|
||||
@@ -621,7 +638,7 @@ ModuleChip {
|
||||
text: root.doNotDisturb ? "On" : "Off"
|
||||
color: root.doNotDisturb ? t.notifDnd : t.notifToastDim
|
||||
font.pixelSize: 11
|
||||
font.bold: root.doNotDisturb
|
||||
font.bold: true
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
Behavior on color { ColorAnimation { duration: 150 } }
|
||||
renderType: Text.NativeRendering
|
||||
@@ -641,7 +658,7 @@ ModuleChip {
|
||||
color: clearHover.hovered ? t.notifHistoryHover : "transparent"
|
||||
Behavior on color { ColorAnimation { duration: 150 } }
|
||||
|
||||
Text { id: clearText; anchors.centerIn: parent; text: "Clear all"; color: t.notifToastDim; font.pixelSize: 11; renderType: Text.NativeRendering }
|
||||
Text { id: clearText; anchors.centerIn: parent; text: "Clear all"; color: t.notifToastDim; font.pixelSize: 11; font.bold: true; renderType: Text.NativeRendering }
|
||||
HoverHandler { id: clearHover; cursorShape: Qt.PointingHandCursor }
|
||||
TapHandler { onTapped: clearAllAnim.start() }
|
||||
}
|
||||
@@ -693,8 +710,8 @@ ModuleChip {
|
||||
width: histCol.width - 16; height: 90; visible: notifHistory.count === 0
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent; spacing: 8
|
||||
Text { text: ""; color: t.notifHistoryEmpty; font.pixelSize: 30; Layout.alignment: Qt.AlignHCenter; renderType: Text.NativeRendering }
|
||||
Text { text: "No notifications"; color: t.notifHistoryEmpty; font.pixelSize: 12; Layout.alignment: Qt.AlignHCenter; renderType: Text.NativeRendering }
|
||||
Text { text: ""; color: t.notifHistoryEmpty; font.pixelSize: 30; font.bold: true; Layout.alignment: Qt.AlignHCenter; renderType: Text.NativeRendering }
|
||||
Text { text: "No notifications"; color: t.notifHistoryEmpty; font.pixelSize: 12; font.bold: true; Layout.alignment: Qt.AlignHCenter; renderType: Text.NativeRendering }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user