mirror of
https://github.com/kossLAN/dots.git
synced 2025-11-04 22:49:50 -05:00
fix: colors on notifs and launcher
This commit is contained in:
parent
9e44812e93
commit
0052b00904
5 changed files with 19 additions and 27 deletions
|
|
@ -14,7 +14,6 @@ Singleton {
|
||||||
property color surface_container: Qt.rgba(0.25, 0.25, 0.25, 1.0)
|
property color surface_container: Qt.rgba(0.25, 0.25, 0.25, 1.0)
|
||||||
property color surface_container_translucent: Qt.rgba(0.25, 0.25, 0.25, 0.25)
|
property color surface_container_translucent: Qt.rgba(0.25, 0.25, 0.25, 0.25)
|
||||||
property color highlight: Qt.rgba(1.0, 1.0, 1.0, 0.85)
|
property color highlight: Qt.rgba(1.0, 1.0, 1.0, 0.85)
|
||||||
// property color primary: "#2EADC6"
|
|
||||||
property color active: Qt.rgba(1.0, 1.0, 1.0, 1.0)
|
property color active: Qt.rgba(1.0, 1.0, 1.0, 1.0)
|
||||||
property color active_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.15)
|
property color active_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.15)
|
||||||
property color border_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.05)
|
property color border_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.05)
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Quickshell
|
import Quickshell
|
||||||
import "power"
|
import "power"
|
||||||
// import "volume"
|
import "volume"
|
||||||
import "systray"
|
import "systray"
|
||||||
// import qs.widgets
|
// import qs.widgets
|
||||||
import qs
|
import qs
|
||||||
|
|
|
||||||
|
|
@ -40,12 +40,12 @@ Singleton {
|
||||||
implicitHeight: 7 + searchContainer.implicitHeight + list.topMargin * 2 + list.delegateHeight * 10
|
implicitHeight: 7 + searchContainer.implicitHeight + list.topMargin * 2 + list.delegateHeight * 10
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
|
WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
|
||||||
WlrLayershell.namespace: "shell:launcher"
|
// WlrLayershell.namespace: "shell:launcher"
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: container
|
id: container
|
||||||
color: ShellSettings.colors["surface"]
|
color: ShellSettings.colors.surface_translucent
|
||||||
radius: 18
|
radius: 12
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
fill: parent
|
fill: parent
|
||||||
|
|
@ -70,9 +70,9 @@ Singleton {
|
||||||
id: searchContainer
|
id: searchContainer
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
implicitHeight: searchbox.implicitHeight + 15
|
implicitHeight: searchbox.implicitHeight + 15
|
||||||
radius: 10
|
radius: 6
|
||||||
color: ShellSettings.colors["surface_container"]
|
color: ShellSettings.colors.surface_container_translucent
|
||||||
border.color: ShellSettings.colors["secondary"]
|
border.color: ShellSettings.colors.border_translucent
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: searchbox
|
id: searchbox
|
||||||
|
|
@ -82,7 +82,7 @@ Singleton {
|
||||||
TextInput {
|
TextInput {
|
||||||
id: search
|
id: search
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
color: ShellSettings.colors["inverse_surface"]
|
color: ShellSettings.colors.highlight
|
||||||
|
|
||||||
focus: true
|
focus: true
|
||||||
Keys.forwardTo: [list]
|
Keys.forwardTo: [list]
|
||||||
|
|
@ -255,8 +255,8 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
highlight: Rectangle {
|
highlight: Rectangle {
|
||||||
radius: 12
|
radius: 6
|
||||||
color: ShellSettings.colors["primary"]
|
color: ShellSettings.colors.active_translucent
|
||||||
}
|
}
|
||||||
|
|
||||||
keyNavigationEnabled: true
|
keyNavigationEnabled: true
|
||||||
|
|
@ -297,7 +297,7 @@ Singleton {
|
||||||
}
|
}
|
||||||
Text {
|
Text {
|
||||||
text: modelData.name
|
text: modelData.name
|
||||||
color: ShellSettings.colors["inverse_surface"]
|
color: ShellSettings.colors.active
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,8 @@ import QtQuick.Layouts
|
||||||
import Quickshell
|
import Quickshell
|
||||||
import Quickshell.Widgets
|
import Quickshell.Widgets
|
||||||
import Quickshell.Services.Notifications
|
import Quickshell.Services.Notifications
|
||||||
import "../widgets/" as Widgets
|
import qs
|
||||||
import ".."
|
import qs.widgets
|
||||||
import "../.."
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
@ -16,10 +15,10 @@ Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: Math.min(row.implicitHeight + 30, 400)
|
height: Math.min(row.implicitHeight + 30, 400)
|
||||||
|
|
||||||
Rectangle {
|
StyledRectangle {
|
||||||
id: container
|
id: container
|
||||||
radius: 10
|
radius: 10
|
||||||
color: ShellSettings.colors["surface_container"]
|
color: ShellSettings.colors.surface_translucent
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
@ -110,7 +109,7 @@ Item {
|
||||||
Text {
|
Text {
|
||||||
id: appName
|
id: appName
|
||||||
text: root.notification.appName
|
text: root.notification.appName
|
||||||
color: ShellSettings.colors["inverse_surface"]
|
color: ShellSettings.colors.active
|
||||||
font.pointSize: 11
|
font.pointSize: 11
|
||||||
font.bold: true
|
font.bold: true
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
|
@ -119,12 +118,10 @@ Item {
|
||||||
Layout.maximumWidth: topRow.width * 0.3
|
Layout.maximumWidth: topRow.width * 0.3
|
||||||
}
|
}
|
||||||
|
|
||||||
Widgets.Separator {}
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
id: summaryText
|
id: summaryText
|
||||||
text: root.notification.summary
|
text: root.notification.summary
|
||||||
color: ShellSettings.colors["inverse_surface"]
|
color: ShellSettings.colors.active
|
||||||
font.pointSize: 11
|
font.pointSize: 11
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
|
|
@ -156,7 +153,7 @@ Item {
|
||||||
|
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.arc(centerX, centerY, radius, -Math.PI / 2, -Math.PI / 2 + 2 * Math.PI * progress);
|
ctx.arc(centerX, centerY, radius, -Math.PI / 2, -Math.PI / 2 + 2 * Math.PI * progress);
|
||||||
ctx.strokeStyle = ShellSettings.colors["primary"];
|
ctx.strokeStyle = ShellSettings.colors.highlight
|
||||||
ctx.lineWidth = 2;
|
ctx.lineWidth = 2;
|
||||||
ctx.stroke();
|
ctx.stroke();
|
||||||
}
|
}
|
||||||
|
|
@ -204,7 +201,7 @@ Item {
|
||||||
Text {
|
Text {
|
||||||
id: bodyText
|
id: bodyText
|
||||||
text: root.notification.body
|
text: root.notification.body
|
||||||
color: ShellSettings.colors["inverse_surface"]
|
color: ShellSettings.colors.active
|
||||||
font.pointSize: 11
|
font.pointSize: 11
|
||||||
wrapMode: Text.Wrap
|
wrapMode: Text.Wrap
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
|
|
||||||
|
|
@ -53,10 +53,6 @@ Scope {
|
||||||
right: true
|
right: true
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
|
||||||
text: "length: " + notificationWindow.visibleCount
|
|
||||||
}
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: notifLayout
|
id: notifLayout
|
||||||
spacing: 15
|
spacing: 15
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue