never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert brightness visibility, fix workspace display on hyprland, add app pinning to applauncher again

Browse source
This commit is contained in:
Ly-sec 2025-07-27 12:22:33 +02:00
parent 57fb71f574
commit 4f5e18bd69
4 changed files with 92 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Bar/Modules/Applauncher.qml
View file

@ -11,6 +11,23 @@ import "../../Helpers/Fuzzysort.js" as Fuzzysort
PanelWithOverlay { PanelWithOverlay {
id: appLauncherPanel id: appLauncherPanel
WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
function isPinned(app) {
return app && app.execString && Settings.settings.pinnedExecs.indexOf(app.execString) !== -1;
}
function togglePin(app) {
if (!app || !app.execString) return;
var arr = Settings.settings.pinnedExecs ? Settings.settings.pinnedExecs.slice() : [];
var idx = arr.indexOf(app.execString);
if (idx === -1) {
arr.push(app.execString);
} else {
arr.splice(idx, 1);
}
Settings.settings.pinnedExecs = arr;
root.updateFilter();
}
function showAt() { function showAt() {
appLauncherPanelRect.showAt(); appLauncherPanelRect.showAt();
} }
@ -126,7 +143,22 @@ PanelWithOverlay {
return r.obj; return r.obj;
})); }));
} }
root.filteredApps = results; // Pinning logic: split into pinned and unpinned
var pinned = [];
var unpinned = [];
for (var i = 0; i < results.length; ++i) {
var app = results[i];
if (app.execString && Settings.settings.pinnedExecs.indexOf(app.execString) !== -1) {
pinned.push(app);
} else {
unpinned.push(app);
}
}
// Sort pinned alphabetically
pinned.sort(function(a, b) {
return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
});
root.filteredApps = pinned.concat(unpinned);
root.selectedIndex = 0; root.selectedIndex = 0;
} }
function selectNext() { function selectNext() {
@ -143,12 +175,15 @@ PanelWithOverlay {
return; return;
var modelData = filteredApps[selectedIndex]; var modelData = filteredApps[selectedIndex];
const termEmu = Quickshell.env("TERMINAL") || Quickshell.env("TERM_PROGRAM") || "";
if (modelData.isCalculator) { if (modelData.isCalculator) {
Qt.callLater(function () { Qt.callLater(function () {
Quickshell.clipboardText = String(modelData.result); Quickshell.clipboardText = String(modelData.result);
Quickshell.execDetached(["notify-send", "Calculator Result", `${modelData.expr} = ${modelData.result} (copied to clipboard)`]); Quickshell.execDetached(["notify-send", "Calculator Result", `${modelData.expr} = ${modelData.result} (copied to clipboard)`]);
}); });
} else if (modelData.runInTerminal && termEmu){
Quickshell.execDetached([termEmu, "-e", modelData.execString.trim()]);
} else if (modelData.execute) { } else if (modelData.execute) {
modelData.execute(); modelData.execute();
} else { } else {
@ -273,10 +308,14 @@ PanelWithOverlay {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: hovered || isSelected ? Theme.accentPrimary : "transparent" color: (hovered || isSelected)
? Theme.accentPrimary
: (appLauncherPanel.isPinned(modelData) ? Theme.surfaceVariant : "transparent")
radius: 12 radius: 12
border.color: hovered || isSelected ? Theme.accentPrimary : "transparent" border.color: appLauncherPanel.isPinned(modelData)
border.width: hovered || isSelected ? 2 : 0 ? "transparent"
: (hovered || isSelected ? Theme.accentPrimary : "transparent")
border.width: appLauncherPanel.isPinned(modelData) ? 0 : (hovered || isSelected ? 2 : 0)
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
duration: 120 duration: 120
@ -328,7 +367,7 @@ PanelWithOverlay {
spacing: 1 spacing: 1
Text { Text {
text: modelData.name text: modelData.name
color: hovered || isSelected ? Theme.onAccent : Theme.textPrimary color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textPrimary)
font.family: Theme.fontFamily font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.bold: hovered || isSelected font.bold: hovered || isSelected
@ -338,7 +377,7 @@ PanelWithOverlay {
} }
Text { Text {
text: modelData.isCalculator ? (modelData.expr + " = " + modelData.result) : (modelData.comment || modelData.genericName || "No description available") text: modelData.isCalculator ? (modelData.expr + " = " + modelData.result) : (modelData.comment || modelData.genericName || "No description available")
color: hovered || isSelected ? Theme.onAccent : Theme.textSecondary color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textSecondary : Theme.textSecondary)
font.family: Theme.fontFamily font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeCaption font.pixelSize: Theme.fontSizeCaption
font.italic: !(modelData.comment || modelData.genericName) font.italic: !(modelData.comment || modelData.genericName)
@ -355,9 +394,14 @@ PanelWithOverlay {
text: modelData.isCalculator ? "content_copy" : "chevron_right" text: modelData.isCalculator ? "content_copy" : "chevron_right"
font.family: "Material Symbols Outlined" font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody font.pixelSize: Theme.fontSizeBody
color: hovered || isSelected ? Theme.onAccent : Theme.textSecondary color: (hovered || isSelected)
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textSecondary)
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.rightMargin: 8 // Add margin to separate from star
} }
// Add a spacing item between chevron and star
Item { width: 8; height: 1 }
} }
Rectangle { Rectangle {
@ -371,7 +415,14 @@ PanelWithOverlay {
id: mouseArea id: mouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: { onClicked: {
// Prevent app launch if click is inside pinArea
if (pinArea.containsMouse) return;
if (mouse.button === Qt.RightButton) {
appLauncherPanel.togglePin(modelData);
return;
}
ripple.opacity = 0.18; ripple.opacity = 0.18;
rippleNumberAnimation.start(); rippleNumberAnimation.start();
root.selectedIndex = index; root.selectedIndex = index;
@ -398,6 +449,37 @@ PanelWithOverlay {
color: Theme.outline color: Theme.outline
opacity: index === appList.count - 1 ? 0 : 0.10 opacity: index === appList.count - 1 ? 0 : 0.10
} }
// Pin/Unpin button (move to last child for stacking)
Item {
id: pinArea
width: 28; height: 28
z: 100 // Ensure above everything else
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
MouseArea {
anchors.fill: parent
preventStealing: true
z: 100
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton
propagateComposedEvents: false
onClicked: {
appLauncherPanel.togglePin(modelData);
event.accepted = true;
}
}
Text {
anchors.centerIn: parent
text: "star"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeSmall
color: (parent.MouseArea.containsMouse || hovered || isSelected)
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textDisabled)
verticalAlignment: Text.AlignVCenter
}
}
} }
} }
} }

1
Bar/Modules/Brightness.qml
View file

@ -16,7 +16,6 @@ Item {
width: pill.width width: pill.width
height: pill.height height: pill.height
visible: brightness >= 0
Process { Process {
id: getBrightnessProcess id: getBrightnessProcess

3
Bar/Modules/Workspace.qml
View file

@ -173,7 +173,8 @@ Item {
if (model.isActive) if (model.isActive)
return Theme.accentSecondary; return Theme.accentSecondary;
if (model.isOccupied) if (model.isOccupied)
return Theme.accentSecondary; return Qt.darker(Theme.accentSecondary, 1.5);
if (model.isUrgent) if (model.isUrgent)
return Theme.error; return Theme.error;

2
Settings/Settings.qml
View file

@ -44,7 +44,7 @@ Singleton {
property string videoPath: "~/Videos/" property string videoPath: "~/Videos/"
property bool showActiveWindowIcon: false property bool showActiveWindowIcon: false
property bool showSystemInfoInBar: false property bool showSystemInfoInBar: false
property bool showCorners: false property bool showCorners: true
property bool showMediaInBar: false property bool showMediaInBar: false
property bool useSWWW: false property bool useSWWW: false
property bool randomWallpaper: false property bool randomWallpaper: false