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

nimagerounded: fixed the buggy PreserveAspectFit in the shader + new default is PreserveAspectCrop

Browse Source
This commit is contained in:
Lemmy
2026-02-04 21:46:05 -05:00
parent a1df4a3e3c
commit 989ebbbdea
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shaders/frag/rounded_image.frag
+8 -20
View File
@@ -47,39 +47,27 @@ void main() {
// Image.TileHorizontally = 5
// Image.Pad = 6
// Default: rounded corners on full item
// Rounded corners always apply to full item bounds
vec2 roundedSize = itemSize;
vec2 roundedCenter = itemSize * 0.5;
// Track if pixel is in letterbox area (for PreserveAspectFit)
bool inLetterbox = false;
if (fillMode == 1) { // PreserveAspectFit
float itemAspect = itemSize.x / itemSize.y;
float sourceAspect = sourceSize.x / sourceSize.y;
// Calculate actual displayed image size and position
vec2 displayedSize;
vec2 offset;
if (sourceAspect > itemAspect) {
// Image is wider than item, letterbox top/bottom
displayedSize = vec2(itemSize.x, itemSize.x / sourceAspect);
offset = vec2(0.0, (itemSize.y - displayedSize.y) * 0.5);
imageUV.y = (qt_TexCoord0.y - 0.5) * (sourceAspect / itemAspect) + 0.5;
} else {
// Image is taller than item, letterbox left/right
displayedSize = vec2(itemSize.y * sourceAspect, itemSize.y);
offset = vec2((itemSize.x - displayedSize.x) * 0.5, 0.0);
imageUV.x = (qt_TexCoord0.x - 0.5) * (itemAspect / sourceAspect) + 0.5;
}
// Apply rounded corners to displayed image bounds
roundedSize = displayedSize;
roundedCenter = offset + displayedSize * 0.5;
// Make letterbox area transparent
if (imageUV.x < 0.0 || imageUV.x > 1.0 || imageUV.y < 0.0 || imageUV.y > 1.0) {
fragColor = vec4(0.0);
return;
}
// Check if in letterbox area
inLetterbox = (imageUV.x < 0.0 || imageUV.x > 1.0 || imageUV.y < 0.0 || imageUV.y > 1.0);
} else if (fillMode == 2) { // PreserveAspectCrop
float itemAspect = itemSize.x / itemSize.y;
float sourceAspect = sourceSize.x / sourceSize.y;
@@ -101,8 +89,8 @@ void main() {
// Create smooth alpha mask for edge with anti-aliasing
float alpha = 1.0 - smoothstep(-0.5, 0.5, distance);
// Sample the texture
vec4 color = texture(source, imageUV);
// Sample the texture (or use transparent for letterbox)
vec4 color = inLetterbox ? vec4(0.0) : texture(source, imageUV);
// Apply the rounded mask and opacity
float finalAlpha = color.a * alpha * itemOpacity * ubuf.qt_Opacity;