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

feat(bar): increased floating margins from 18px to 500px - fixed smart panels opening positions to properly account for thoses margins.

Browse Source
This commit is contained in:
Lemmy
2026-03-08 11:22:06 -04:00
parent 9acb3facfa
commit 1fd0b187b5
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/MainScreen/SmartPanel.qml
+32 -27
View File
@@ -163,11 +163,41 @@ Item {
// Reset to default - fixes panel being stuck in one position
root.useButtonPosition = false;
// Calculate the bar window's position on screen based on bar settings
// The BarContentWindow uses anchors + margins, so we need to compute its origin
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 - root.barHeight;
} else if (root.barPosition === "left") {
barWindowX = root.barMarginH;
} else if (root.isFramed) {
barWindowX = root.frameThickness;
} else {
// Horizontal floating bars: BarContentWindow has margins.left = barMarginH
barWindowX = root.barMarginH;
}
if (root.barPosition === "bottom") {
barWindowY = screenHeight - root.barMarginV - root.barHeight;
} else if (root.barPosition === "top") {
barWindowY = root.barMarginV;
} else if (root.isFramed) {
barWindowY = root.frameThickness;
} else {
// Vertical floating bars: BarContentWindow has margins.top = barMarginV
barWindowY = root.barMarginV;
}
if (!buttonItem && buttonName) {
// Check if buttonName is actually a point object (click coordinates)
if (typeof buttonName === "object" && buttonName.x !== undefined && buttonName.y !== undefined) {
root.buttonItem = null;
root.buttonPosition = buttonName;
// Click coordinates are in BarContentWindow-local space, offset to screen space
root.buttonPosition = Qt.point(barWindowX + buttonName.x, barWindowY + buttonName.y);
root.buttonWidth = 0;
root.buttonHeight = 0;
root.useButtonPosition = true;
@@ -181,34 +211,9 @@ Item {
if (buttonItem && typeof buttonItem.mapToItem === "function") {
try {
root.buttonItem = buttonItem;
// Map button position within its window
// Map button position within its window (BarContentWindow-local coordinates)
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;
if (root.barPosition === "right") {
barWindowX = screenWidth - root.barMarginH - root.barHeight;
} else if (root.barPosition === "left") {
barWindowX = root.barMarginH;
} else if (root.isFramed) {
barWindowX = root.frameThickness;
}
// For top/bottom bars, barWindowX stays 0 (full width window) unless framed
if (root.barPosition === "bottom") {
barWindowY = screenHeight - root.barMarginV - root.barHeight;
} else if (root.barPosition === "top") {
barWindowY = root.barMarginV;
} else if (root.isFramed) {
barWindowY = root.frameThickness;
}
// For left/right bars, barWindowY stays 0 (full height window) unless framed
root.buttonPosition = Qt.point(barWindowX + buttonLocal.x, barWindowY + buttonLocal.y);
root.buttonWidth = buttonItem.width;
root.buttonHeight = buttonItem.height;
Modules/Panels/Settings/Tabs/Bar/AppearanceSubTab.qml
+2 -2
View File
@@ -306,7 +306,7 @@ ColumnLayout {
Layout.fillWidth: true
label: I18n.tr("panels.bar.appearance-margins-vertical")
from: 0
to: 18
to: 500
stepSize: 1
showReset: true
value: Settings.data.bar.marginVertical
@@ -319,7 +319,7 @@ ColumnLayout {
Layout.fillWidth: true
label: I18n.tr("panels.bar.appearance-margins-horizontal")
from: 0
to: 18
to: 500
stepSize: 1
showReset: true
value: Settings.data.bar.marginHorizontal