mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2025-12-06 06:36:15 +00:00
AboutTab: caching circular images
This commit is contained in:
@@ -308,7 +308,11 @@
|
||||
"autoHideMs": 2000,
|
||||
"overlayLayer": true,
|
||||
"backgroundOpacity": 1,
|
||||
"enabledTypes": [],
|
||||
"enabledTypes": [
|
||||
0,
|
||||
1,
|
||||
2
|
||||
],
|
||||
"monitors": []
|
||||
},
|
||||
"audio": {
|
||||
@@ -354,6 +358,8 @@
|
||||
"spicetify": false,
|
||||
"telegram": false,
|
||||
"cava": false,
|
||||
"emacs": false,
|
||||
"niri": false,
|
||||
"enableUserTemplates": false
|
||||
},
|
||||
"nightLight": {
|
||||
|
||||
@@ -15,6 +15,8 @@ ColumnLayout {
|
||||
property string currentVersion: UpdateService.currentVersion
|
||||
property var contributors: GitHubService.contributors
|
||||
|
||||
readonly property int topContributorsCount: 20
|
||||
|
||||
spacing: Style.marginL
|
||||
|
||||
NHeader {
|
||||
@@ -157,7 +159,7 @@ ColumnLayout {
|
||||
spacing: Style.marginM
|
||||
|
||||
Repeater {
|
||||
model: Math.min(root.contributors.length, 20)
|
||||
model: Math.min(root.contributors.length, root.topContributorsCount)
|
||||
|
||||
delegate: Rectangle {
|
||||
width: Math.round(Style.baseWidgetSize * 6.8)
|
||||
@@ -312,21 +314,21 @@ ColumnLayout {
|
||||
// Remaining contributors (simple text links)
|
||||
Flow {
|
||||
id: remainingContributorsFlow
|
||||
visible: root.contributors.length > 20
|
||||
visible: root.contributors.length > root.topContributorsCount
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.preferredWidth: Math.round(Style.baseWidgetSize * 14)
|
||||
Layout.topMargin: Style.marginL
|
||||
spacing: Style.marginS
|
||||
|
||||
Repeater {
|
||||
model: Math.max(0, root.contributors.length - 20)
|
||||
model: Math.max(0, root.contributors.length - root.topContributorsCount)
|
||||
|
||||
delegate: Rectangle {
|
||||
width: nameText.implicitWidth + Style.marginM * 2
|
||||
height: nameText.implicitHeight + Style.marginS * 2
|
||||
radius: Style.radiusS
|
||||
color: nameArea.containsMouse ? Qt.alpha(Color.mPrimary, 0.1) : Color.transparent
|
||||
border.width: 1
|
||||
color: nameArea.containsMouse ? Color.mHover : Color.transparent
|
||||
border.width: Style.borderS
|
||||
border.color: nameArea.containsMouse ? Color.mPrimary : Color.mOutline
|
||||
|
||||
Behavior on color {
|
||||
@@ -344,9 +346,9 @@ ColumnLayout {
|
||||
NText {
|
||||
id: nameText
|
||||
anchors.centerIn: parent
|
||||
text: root.contributors[index + 20].login || "Unknown"
|
||||
text: root.contributors[index + root.topContributorsCount].login || "Unknown"
|
||||
pointSize: Style.fontSizeXS
|
||||
color: nameArea.containsMouse ? Color.mPrimary : Color.mOnSurface
|
||||
color: nameArea.containsMouse ? Color.mOnHover : Color.mOnSurface
|
||||
font.weight: Style.fontWeightMedium
|
||||
|
||||
Behavior on color {
|
||||
@@ -362,8 +364,8 @@ ColumnLayout {
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
if (root.contributors[index + 20].html_url)
|
||||
Quickshell.execDetached(["xdg-open", root.contributors[index + 20].html_url]);
|
||||
if (root.contributors[index + root.topContributorsCount].html_url)
|
||||
Quickshell.execDetached(["xdg-open", root.contributors[index + root.topContributorsCount].html_url]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Wayland
|
||||
import Quickshell.Widgets
|
||||
import qs.Commons
|
||||
|
||||
/**
|
||||
* CircularAvatarRenderer - Hidden window for rendering circular avatars
|
||||
*
|
||||
* This component safely uses ClippingRectangle in a separate hidden window to
|
||||
* pre-render circular avatar images. The rendered images are saved as PNGs
|
||||
* with transparent backgrounds, which can then be used in the UI without
|
||||
* any shader effects (avoiding Qt 6.8 crashes).
|
||||
*
|
||||
* Usage:
|
||||
* var renderer = component.createObject(null, {
|
||||
* imagePath: "file:///path/to/avatar.png",
|
||||
* outputPath: "/path/to/output_circular.png",
|
||||
* username: "ItsLemmy"
|
||||
* });
|
||||
* renderer.renderComplete.connect(function(success) {
|
||||
* if (success) console.log("Rendered!");
|
||||
* renderer.destroy();
|
||||
* });
|
||||
*/
|
||||
PanelWindow {
|
||||
id: root
|
||||
|
||||
// Input properties
|
||||
property string imagePath: ""
|
||||
property string outputPath: ""
|
||||
property string username: ""
|
||||
|
||||
// Hidden window configuration
|
||||
implicitWidth: 256
|
||||
implicitHeight: 256
|
||||
visible: true // Must be visible for grabToImage to work
|
||||
color: "transparent"
|
||||
|
||||
// Wayland configuration - hide it from user view
|
||||
WlrLayershell.layer: WlrLayer.Bottom // Render below everything
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
|
||||
|
||||
// Position it off-screen or behind everything
|
||||
anchors {
|
||||
left: true
|
||||
top: true
|
||||
}
|
||||
margins {
|
||||
left: -512// Off-screen to the left
|
||||
top: -512 // Off-screen to the top
|
||||
}
|
||||
|
||||
signal renderComplete(bool success)
|
||||
|
||||
// Use ClippingRectangle safely (not in GridView, not visible)
|
||||
ClippingRectangle {
|
||||
id: clipper
|
||||
anchors.fill: parent
|
||||
radius: width * 0.5 // Make it circular
|
||||
color: "transparent"
|
||||
|
||||
Image {
|
||||
id: sourceImage
|
||||
anchors.fill: parent
|
||||
source: root.imagePath
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
smooth: true
|
||||
mipmap: true
|
||||
asynchronous: true
|
||||
|
||||
onStatusChanged: {
|
||||
if (status === Image.Ready) {
|
||||
// Image loaded successfully, capture it on next frame
|
||||
Qt.callLater(captureCircular);
|
||||
} else if (status === Image.Error) {
|
||||
Logger.e("CircularAvatarRenderer", "Failed to load image for", root.username);
|
||||
root.renderComplete(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function captureCircular() {
|
||||
clipper.grabToImage(function (result) {
|
||||
if (result.saveToFile(root.outputPath)) {
|
||||
Logger.d("CircularAvatarRenderer", "Saved circular avatar for", root.username, "to", root.outputPath);
|
||||
root.renderComplete(true);
|
||||
} else {
|
||||
Logger.e("CircularAvatarRenderer", "Failed to save circular avatar for", root.username);
|
||||
root.renderComplete(false);
|
||||
}
|
||||
}, Qt.size(root.width, root.height));
|
||||
}
|
||||
}
|
||||
@@ -92,7 +92,7 @@ Singleton {
|
||||
// --------------------------------
|
||||
function fetchFromGitHub() {
|
||||
if (isFetchingData) {
|
||||
Logger.w("GitHub", "GitHub data is still fetching");
|
||||
Logger.d("GitHub", "GitHub data is still fetching");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -344,47 +344,49 @@ Singleton {
|
||||
}
|
||||
|
||||
function renderCircularAvatar(inputPath, outputPath, username, avatarUrl) {
|
||||
var rendererComponent = Qt.createComponent(Quickshell.shellDir + "/Modules/Renderer/CircularAvatarRenderer.qml");
|
||||
if (rendererComponent.status === Component.Ready) {
|
||||
var renderer = rendererComponent.createObject(root, {
|
||||
imagePath: "file://" + inputPath,
|
||||
outputPath: outputPath,
|
||||
username: username
|
||||
});
|
||||
Logger.d("GitHubService", "Rendering circular avatar for", username);
|
||||
|
||||
renderer.renderComplete.connect(function (success) {
|
||||
if (success) {
|
||||
// Update cache metadata
|
||||
cacheMetadata[username] = {
|
||||
avatar_url: avatarUrl,
|
||||
cached_path: outputPath,
|
||||
cached_at: Date.now()
|
||||
};
|
||||
// Use ImageMagick to create a circular avatar with proper alpha transparency
|
||||
var convertProcess = Qt.createQmlObject(`
|
||||
import QtQuick
|
||||
import Quickshell.Io
|
||||
Process {
|
||||
command: ["magick", "${inputPath}", "-resize", "256x256^", "-gravity", "center", "-extent", "256x256", "-alpha", "set", "(", "+clone", "-channel", "A", "-evaluate", "set", "0", "+channel", "-fill", "white", "-draw", "circle 128,128 128,0", ")", "-compose", "DstIn", "-composite", "${outputPath}"]
|
||||
}
|
||||
`, root, "Convert_" + Date.now());
|
||||
|
||||
cachedCircularAvatars[username] = "file://" + outputPath;
|
||||
cachedCircularAvatarsChanged();
|
||||
convertProcess.exited.connect(function (exitCode) {
|
||||
var success = exitCode === 0;
|
||||
|
||||
saveCacheMetadata();
|
||||
if (success) {
|
||||
// Update cache metadata
|
||||
cacheMetadata[username] = {
|
||||
avatar_url: avatarUrl,
|
||||
cached_path: outputPath,
|
||||
cached_at: Date.now()
|
||||
};
|
||||
|
||||
Logger.d("GitHubService", "Cached circular avatar for", username);
|
||||
} else {
|
||||
Logger.e("GitHubService", "Failed to render circular avatar for", username);
|
||||
}
|
||||
cachedCircularAvatars[username] = "file://" + outputPath;
|
||||
cachedCircularAvatarsChanged();
|
||||
|
||||
renderer.destroy();
|
||||
saveCacheMetadata();
|
||||
|
||||
// Clean up temp file
|
||||
Quickshell.execDetached(["rm", "-f", inputPath]);
|
||||
Logger.d("GitHubService", "Cached circular avatar for", username);
|
||||
} else {
|
||||
Logger.e("GitHubService", "Failed to render circular avatar for", username);
|
||||
}
|
||||
|
||||
// Process next in queue
|
||||
isProcessingAvatars = false;
|
||||
processNextAvatar();
|
||||
});
|
||||
} else {
|
||||
Logger.e("GitHubService", "Failed to create CircularAvatarRenderer");
|
||||
// Clean up temp file
|
||||
Quickshell.execDetached(["rm", "-f", inputPath]);
|
||||
|
||||
// Process next in queue
|
||||
isProcessingAvatars = false;
|
||||
processNextAvatar();
|
||||
}
|
||||
|
||||
convertProcess.destroy();
|
||||
});
|
||||
|
||||
convertProcess.running = true;
|
||||
}
|
||||
|
||||
// --------------------------------
|
||||
|
||||
Reference in New Issue
Block a user