never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually fix CustomTrayMenu, fix some positioning

Browse source
This commit is contained in:
ly-sec 2025-07-16 14:08:29 +02:00
parent e19b6e9a47
commit fb3b5f5769
7 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Bar/Bar.qml
View file

@ -176,7 +176,7 @@ Scope {
id: bottomLeftCorner id: bottomLeftCorner
position: "topleft" position: "topleft"
size: 1.3 size: 1.3
fillColor: "#00FFFF" fillColor: Theme.backgroundPrimary
offsetX: -39 offsetX: -39
offsetY: 0 offsetY: 0
anchors.top: parent.top anchors.top: parent.top
@ -198,7 +198,7 @@ Scope {
id: bottomRightCorner id: bottomRightCorner
position: "topright" position: "topright"
size: 1.3 size: 1.3
fillColor: "#00FFFF"//(Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222" fillColor: Theme.backgroundPrimary
offsetX: 39 offsetX: 39
offsetY: 0 offsetY: 0
anchors.top: parent.top anchors.top: parent.top

2
Bar/Modules/CustomTrayMenu.qml
View file

@ -92,7 +92,7 @@ PopupWindow {
id: bg id: bg
anchors.fill: parent anchors.fill: parent
color: mouseArea.containsMouse ? Theme.highlight : "transparent" color: mouseArea.containsMouse ? Theme.highlight : "transparent"
radius: 12 radius: 8
visible: !(modelData?.isSeparator ?? false) visible: !(modelData?.isSeparator ?? false)
property color hoverTextColor: mouseArea.containsMouse ? Theme.onAccent : Theme.textPrimary property color hoverTextColor: mouseArea.containsMouse ? Theme.onAccent : Theme.textPrimary

2
Bar/Modules/SystemTray.qml
View file

@ -136,7 +136,7 @@ Row {
StyledTooltip { StyledTooltip {
id: trayTooltip id: trayTooltip
text: modelData.name || modelData.id || "Tray Item" text: modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item"
tooltipVisible: false tooltipVisible: false
targetItem: trayIcon targetItem: trayIcon
delay: 200 delay: 200

38
Settings/Theme.json
View file

@ -1,28 +1,28 @@
{ {
"backgroundPrimary": "#0E0F10", "backgroundPrimary": "#111211",
"backgroundSecondary": "#1A1B1C", "backgroundSecondary": "#1D1E1D",
"backgroundTertiary": "#262728", "backgroundTertiary": "#292A29",
"surface": "#212223", "surface": "#242524",
"surfaceVariant": "#323334", "surfaceVariant": "#353635",
"textPrimary": "#F0F1E0", "textPrimary": "#F4E9E3",
"textSecondary": "#D8D9CA", "textSecondary": "#DCD2CC",
"textDisabled": "#909186", "textDisabled": "#928C88",
"accentPrimary": "#A3A485", "accentPrimary": "#7D8079",
"accentSecondary": "#B5B69D", "accentSecondary": "#979994",
"accentTertiary": "#82836A", "accentTertiary": "#646661",
"error": "#A5A9ED", "error": "#939849",
"warning": "#B9BCF1", "warning": "#ABAF72",
"highlight": "#C8C8B6", "highlight": "#B1B3AF",
"rippleEffect": "#ACAD91", "rippleEffect": "#8A8D86",
"onAccent": "#0E0F10", "onAccent": "#111211",
"outline": "#565758", "outline": "#585958",
"shadow": "#0E0F10", "shadow": "#111211",
"overlay": "#0E0F10" "overlay": "#111211"
} }

2
Widgets/Sidebar/Config/SettingsModal.qml
View file

@ -16,7 +16,7 @@ PanelWindow {
anchors.top: true anchors.top: true
anchors.right: true anchors.right: true
margins.right: 0 margins.right: 0
margins.top: -24 margins.top: 0
//z: 100 //z: 100
//border.color: Theme.outline //border.color: Theme.outline
//border.width: 1 //border.width: 1

6
Widgets/Sidebar/Panel/System.qml
View file

@ -114,8 +114,8 @@ Rectangle {
width: 32 width: 32
height: 32 height: 32
radius: 16 radius: 16
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.accentPrimary : "transparent" color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.error : "transparent"
border.color: Theme.accentPrimary border.color: Theme.error
border.width: 1 border.width: 1
Text { Text {
@ -123,7 +123,7 @@ Rectangle {
text: "power_settings_new" text: "power_settings_new"
font.family: "Material Symbols Outlined" font.family: "Material Symbols Outlined"
font.pixelSize: 16 font.pixelSize: 16
color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.backgroundPrimary : Theme.accentPrimary color: systemButtonArea.containsMouse || systemButtonArea.pressed ? Theme.backgroundPrimary : Theme.error
} }
MouseArea { MouseArea {

2
Widgets/Sidebar/Panel/WallpaperPanel.qml
View file

@ -16,7 +16,7 @@ PanelWindow {
anchors.top: true anchors.top: true
anchors.right: true anchors.right: true
margins.right: 0 margins.right: 0
margins.top: -24 margins.top: 0
property var wallpapers: [] property var wallpapers: []