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

Tooltip: fix positioning by respecting screen boundaries. Helps a lot on wlroots based WM.

Browse Source
This commit is contained in:
ItsLemmy
2025-12-08 19:51:47 -05:00
parent 0d646a5967
commit d396e3daf2
1 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Tooltip/Tooltip.qml
+41 -15
View File
@@ -25,6 +25,8 @@ PopupWindow {
property bool animatingOut: true
property int screenWidth: 1920
property int screenHeight: 1080
property int screenX: 0
property int screenY: 0
visible: false
color: Color.transparent
@@ -138,6 +140,8 @@ PopupWindow {
if (targetGlobal.x >= s.x && targetGlobal.x < s.x + s.width && targetGlobal.y >= s.y && targetGlobal.y < s.y + s.height) {
screenWidth = s.width;
screenHeight = s.height;
screenX = s.x;
screenY = s.y;
foundScreen = true;
break;
}
@@ -175,8 +179,12 @@ PopupWindow {
const tipHeight = tooltipText.implicitHeight + (padding * 2);
root.implicitHeight = tipHeight;
// Get target's global position
var targetGlobal = targetItem.mapToItem(null, 0, 0);
// Get target's global position and convert to screen-relative
var targetGlobalAbs = targetItem.mapToGlobal(0, 0);
var targetGlobal = {
"x": targetGlobalAbs.x - screenX,
"y": targetGlobalAbs.y - screenY
};
const targetWidth = targetItem.width;
const targetHeight = targetItem.height;
@@ -184,7 +192,7 @@ PopupWindow {
var newAnchorY = 0;
if (direction === "auto") {
// Calculate available space in each direction
// Calculate available space in each direction (screen-relative)
const spaceLeft = targetGlobal.x;
const spaceRight = screenWidth - (targetGlobal.x + targetWidth);
const spaceTop = targetGlobal.y;
@@ -242,16 +250,6 @@ PopupWindow {
newAnchorX = selectedPosition.x;
newAnchorY = selectedPosition.y;
// Adjust horizontal position to keep tooltip on screen
if (direction === "auto") {
const globalX = targetGlobal.x + newAnchorX;
if (globalX < 0) {
newAnchorX = -targetGlobal.x + margin;
} else if (globalX + tipWidth > screenWidth) {
newAnchorX = screenWidth - targetGlobal.x - tipWidth - margin;
}
}
} else {
// Manual direction positioning
switch (direction) {
@@ -274,6 +272,22 @@ PopupWindow {
}
}
// Adjust horizontal position to keep tooltip on screen
const globalX = targetGlobal.x + newAnchorX;
if (globalX < 0) {
newAnchorX = -targetGlobal.x + margin;
} else if (globalX + tipWidth > screenWidth) {
newAnchorX = screenWidth - targetGlobal.x - tipWidth - margin;
}
// Adjust vertical position to keep tooltip on screen
const globalY = targetGlobal.y + newAnchorY;
if (globalY < 0) {
newAnchorY = -targetGlobal.y + margin;
} else if (globalY + tipHeight > screenHeight) {
newAnchorY = screenHeight - targetGlobal.y - tipHeight - margin;
}
// Apply position first (before making visible)
anchorX = newAnchorX;
anchorY = newAnchorY;
@@ -340,8 +354,12 @@ PopupWindow {
const tipHeight = tooltipText.implicitHeight + (padding * 2);
root.implicitHeight = tipHeight;
// Reposition based on current direction
var targetGlobal = targetItem.mapToItem(null, 0, 0);
// Reposition based on current direction (screen-relative)
var targetGlobalAbs = targetItem.mapToGlobal(0, 0);
var targetGlobal = {
"x": targetGlobalAbs.x - screenX,
"y": targetGlobalAbs.y - screenY
};
const targetWidth = targetItem.width;
const targetHeight = targetItem.height;
@@ -373,6 +391,14 @@ PopupWindow {
newAnchorX = screenWidth - targetGlobal.x - tipWidth - margin;
}
// Adjust vertical position to keep tooltip on screen if needed
const globalY = targetGlobal.y + newAnchorY;
if (globalY < 0) {
newAnchorY = -targetGlobal.y + margin;
} else if (globalY + tipHeight > screenHeight) {
newAnchorY = screenHeight - targetGlobal.y - tipHeight - margin;
}
// Apply the new anchor positions
anchorX = newAnchorX;
anchorY = newAnchorY;