lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Panels&IPC: attempt to figure #1166

Browse Source
This commit is contained in:
Lemmy
2025-12-28 14:47:02 -05:00
parent 694cfc426e
commit 823d0b9225
2 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/MainScreen/SmartPanel.qml
+35 -28
View File
@@ -149,38 +149,45 @@ Item {
buttonItem = BarService.lookupWidget(buttonName, screen.name);
}
if (buttonItem) {
root.buttonItem = buttonItem;
// Map button position within its window
var buttonLocal = buttonItem.mapToItem(null, 0, 0);
// Validate buttonItem is a valid QML Item with mapToItem function
if (buttonItem && typeof buttonItem.mapToItem === "function") {
try {
root.buttonItem = buttonItem;
// Map button position within its window
var buttonLocal = buttonItem.mapToItem(null, 0, 0);
// Calculate the bar window's position on screen based on bar settings
// The BarContentWindow uses anchors, so we need to compute its position
var barWindowX = 0;
var barWindowY = 0;
var screenWidth = root.screen?.width || 0;
var screenHeight = root.screen?.height || 0;
// Calculate the bar window's position on screen based on bar settings
// The BarContentWindow uses anchors, so we need to compute its position
var barWindowX = 0;
var barWindowY = 0;
var screenWidth = root.screen?.width || 0;
var screenHeight = root.screen?.height || 0;
if (root.barPosition === "right") {
barWindowX = screenWidth - root.barMarginH - Style.barHeight;
} else if (root.barPosition === "left") {
barWindowX = root.barMarginH;
if (root.barPosition === "right") {
barWindowX = screenWidth - root.barMarginH - Style.barHeight;
} else if (root.barPosition === "left") {
barWindowX = root.barMarginH;
}
// For top/bottom bars, barWindowX stays 0 (full width window)
if (root.barPosition === "bottom") {
barWindowY = screenHeight - root.barMarginV - Style.barHeight;
} else if (root.barPosition === "top") {
barWindowY = root.barMarginV;
}
// For left/right bars, barWindowY stays 0 (full height window)
root.buttonPosition = Qt.point(barWindowX + buttonLocal.x, barWindowY + buttonLocal.y);
root.buttonWidth = buttonItem.width;
root.buttonHeight = buttonItem.height;
root.useButtonPosition = true;
} catch (e) {
Logger.w("SmartPanel", "Failed to get button position, using default positioning:", e);
root.buttonItem = null;
root.useButtonPosition = false;
}
// For top/bottom bars, barWindowX stays 0 (full width window)
if (root.barPosition === "bottom") {
barWindowY = screenHeight - root.barMarginV - Style.barHeight;
} else if (root.barPosition === "top") {
barWindowY = root.barMarginV;
}
// For left/right bars, barWindowY stays 0 (full height window)
root.buttonPosition = Qt.point(barWindowX + buttonLocal.x, barWindowY + buttonLocal.y);
root.buttonWidth = buttonItem.width;
root.buttonHeight = buttonItem.height;
root.useButtonPosition = true;
} else {
// No button provided: reset button position mode
// No valid button provided: reset button position mode
root.buttonItem = null;
root.useButtonPosition = false;
}