mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Actually fix CustomTrayMenu, fix some positioning
This commit is contained in:
+2
-2
@@ -176,7 +176,7 @@ Scope {
|
||||
id: bottomLeftCorner
|
||||
position: "topleft"
|
||||
size: 1.3
|
||||
fillColor: "#00FFFF"
|
||||
fillColor: Theme.backgroundPrimary
|
||||
offsetX: -39
|
||||
offsetY: 0
|
||||
anchors.top: parent.top
|
||||
@@ -198,7 +198,7 @@ Scope {
|
||||
id: bottomRightCorner
|
||||
position: "topright"
|
||||
size: 1.3
|
||||
fillColor: "#00FFFF"//(Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222"
|
||||
fillColor: Theme.backgroundPrimary
|
||||
offsetX: 39
|
||||
offsetY: 0
|
||||
anchors.top: parent.top
|
||||
|
||||
@@ -92,7 +92,7 @@ PopupWindow {
|
||||
id: bg
|
||||
anchors.fill: parent
|
||||
color: mouseArea.containsMouse ? Theme.highlight : "transparent"
|
||||
radius: 12
|
||||
radius: 8
|
||||
visible: !(modelData?.isSeparator ?? false)
|
||||
property color hoverTextColor: mouseArea.containsMouse ? Theme.onAccent : Theme.textPrimary
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ Row {
|
||||
|
||||
StyledTooltip {
|
||||
id: trayTooltip
|
||||
text: modelData.name || modelData.id || "Tray Item"
|
||||
text: modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item"
|
||||
tooltipVisible: false
|
||||
targetItem: trayIcon
|
||||
delay: 200
|
||||
|
||||
+19
-19
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"backgroundPrimary": "#0E0F10",
|
||||
"backgroundSecondary": "#1A1B1C",
|
||||
"backgroundTertiary": "#262728",
|
||||
"backgroundPrimary": "#111211",
|
||||
"backgroundSecondary": "#1D1E1D",
|
||||
"backgroundTertiary": "#292A29",
|
||||
|
||||
"surface": "#212223",
|
||||
"surfaceVariant": "#323334",
|
||||
"surface": "#242524",
|
||||
"surfaceVariant": "#353635",
|
||||
|
||||
"textPrimary": "#F0F1E0",
|
||||
"textSecondary": "#D8D9CA",
|
||||
"textDisabled": "#909186",
|
||||
"textPrimary": "#F4E9E3",
|
||||
"textSecondary": "#DCD2CC",
|
||||
"textDisabled": "#928C88",
|
||||
|
||||
"accentPrimary": "#A3A485",
|
||||
"accentSecondary": "#B5B69D",
|
||||
"accentTertiary": "#82836A",
|
||||
"accentPrimary": "#7D8079",
|
||||
"accentSecondary": "#979994",
|
||||
"accentTertiary": "#646661",
|
||||
|
||||
"error": "#A5A9ED",
|
||||
"warning": "#B9BCF1",
|
||||
"error": "#939849",
|
||||
"warning": "#ABAF72",
|
||||
|
||||
"highlight": "#C8C8B6",
|
||||
"rippleEffect": "#ACAD91",
|
||||
"highlight": "#B1B3AF",
|
||||
"rippleEffect": "#8A8D86",
|
||||
|
||||
"onAccent": "#0E0F10",
|
||||
"outline": "#565758",
|
||||
"onAccent": "#111211",
|
||||
"outline": "#585958",
|
||||
|
||||
"shadow": "#0E0F10",
|
||||
"overlay": "#0E0F10"
|
||||
"shadow": "#111211",
|
||||
"overlay": "#111211"
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ PanelWindow {
|
||||
anchors.top: true
|
||||
anchors.right: true
|
||||
margins.right: 0
|
||||
margins.top: -24
|
||||
margins.top: 0
|
||||
//z: 100
|
||||
//border.color: Theme.outline
|
||||
//border.width: 1
|
||||
|
||||
@@ -114,8 +114,8 @@ Rectangle {
|
||||
width: 32
|
||||
height: 32
|
||||
radius: 16
|
||||
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.accentPrimary : "transparent"
|
||||
border.color: Theme.accentPrimary
|
||||
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.error : "transparent"
|
||||
border.color: Theme.error
|
||||
border.width: 1
|
||||
|
||||
Text {
|
||||
@@ -123,7 +123,7 @@ Rectangle {
|
||||
text: "power_settings_new"
|
||||
font.family: "Material Symbols Outlined"
|
||||
font.pixelSize: 16
|
||||
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.backgroundPrimary : Theme.accentPrimary
|
||||
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.backgroundPrimary : Theme.error
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
|
||||
@@ -16,7 +16,7 @@ PanelWindow {
|
||||
anchors.top: true
|
||||
anchors.right: true
|
||||
margins.right: 0
|
||||
margins.top: -24
|
||||
margins.top: 0
|
||||
|
||||
property var wallpapers: []
|
||||
|
||||
|
||||
Reference in New Issue
Block a user