Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

keybinds: fix provider loading via IPC

Browse Source
This commit is contained in:
bbedward
2025-12-09 00:30:14 -05:00
parent 0be9ac4097
commit 8a83f03cc1
3 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
quickshell/DMSShellIPC.qml
View File

@@ -332,18 +332,16 @@ Item {
if (!provider) if (!provider)
return "ERROR: No provider specified"; return "ERROR: No provider specified";
KeybindsService.currentProvider = provider; KeybindsService.loadCheatsheet(provider);
KeybindsService.loadBinds();
root.hyprKeybindsModalLoader.active = true; root.hyprKeybindsModalLoader.active = true;
if (!root.hyprKeybindsModalLoader.item) if (!root.hyprKeybindsModalLoader.item)
return `KEYBINDS_TOGGLE_FAILED: ${provider}`; return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
if (root.hyprKeybindsModalLoader.item.shouldBeVisible) { if (root.hyprKeybindsModalLoader.item.shouldBeVisible)
root.hyprKeybindsModalLoader.item.close(); root.hyprKeybindsModalLoader.item.close();
} else { else
root.hyprKeybindsModalLoader.item.open(); root.hyprKeybindsModalLoader.item.open();
}
return `KEYBINDS_TOGGLE_SUCCESS: ${provider}`; return `KEYBINDS_TOGGLE_SUCCESS: ${provider}`;
} }
@@ -351,18 +349,16 @@ Item {
if (!provider) if (!provider)
return "ERROR: No provider specified"; return "ERROR: No provider specified";
KeybindsService.currentProvider = provider; KeybindsService.loadCheatsheet(provider);
KeybindsService.loadBinds();
root.hyprKeybindsModalLoader.active = true; root.hyprKeybindsModalLoader.active = true;
if (!root.hyprKeybindsModalLoader.item) if (!root.hyprKeybindsModalLoader.item)
return `KEYBINDS_TOGGLE_FAILED: ${provider}`; return `KEYBINDS_TOGGLE_FAILED: ${provider}`;
if (root.hyprKeybindsModalLoader.item.shouldBeVisible) { if (root.hyprKeybindsModalLoader.item.shouldBeVisible)
root.hyprKeybindsModalLoader.item.close(); root.hyprKeybindsModalLoader.item.close();
} else { else
root.hyprKeybindsModalLoader.item.open(); root.hyprKeybindsModalLoader.item.open();
}
return `KEYBINDS_TOGGLE_SUCCESS: ${provider} (${path})`; return `KEYBINDS_TOGGLE_SUCCESS: ${provider} (${path})`;
} }
@@ -370,8 +366,7 @@ Item {
if (!provider) if (!provider)
return "ERROR: No provider specified"; return "ERROR: No provider specified";
KeybindsService.currentProvider = provider; KeybindsService.loadCheatsheet(provider);
KeybindsService.loadBinds();
root.hyprKeybindsModalLoader.active = true; root.hyprKeybindsModalLoader.active = true;
if (!root.hyprKeybindsModalLoader.item) if (!root.hyprKeybindsModalLoader.item)
@@ -385,8 +380,7 @@ Item {
if (!provider) if (!provider)
return "ERROR: No provider specified"; return "ERROR: No provider specified";
KeybindsService.currentProvider = provider; KeybindsService.loadCheatsheet(provider);
KeybindsService.loadBinds();
root.hyprKeybindsModalLoader.active = true; root.hyprKeybindsModalLoader.active = true;
if (!root.hyprKeybindsModalLoader.item) if (!root.hyprKeybindsModalLoader.item)

54
quickshell/Modals/KeybindsModal.qml
View File

@@ -19,7 +19,7 @@ DankModal {
onBackgroundClicked: close() onBackgroundClicked: close()
onOpened: { onOpened: {
Qt.callLater(() => modalFocusScope.forceActiveFocus()); Qt.callLater(() => modalFocusScope.forceActiveFocus());
if (KeybindsService.cheatsheetAvailable) if (!Object.keys(KeybindsService.cheatsheet).length && KeybindsService.cheatsheetAvailable)
KeybindsService.loadCheatsheet(); KeybindsService.loadCheatsheet();
} }
@@ -118,12 +118,36 @@ DankModal {
} }
property var categoryKeys: Object.keys(categories) property var categoryKeys: Object.keys(categories)
function estimateCategoryHeight(catName) {
const catData = categories[catName];
if (!catData)
return 0;
let bindCount = 0;
for (const key of catData.subcatKeys) {
bindCount += catData.subcats[key]?.length || 0;
if (key !== "_root")
bindCount += 1;
}
return 40 + bindCount * 28;
}
function distributeCategories(cols) { function distributeCategories(cols) {
const columns = []; const columns = [];
for (let i = 0; i < cols; i++) const heights = [];
for (let i = 0; i < cols; i++) {
columns.push([]); columns.push([]);
for (let i = 0; i < categoryKeys.length; i++) heights.push(0);
columns[i % cols].push(categoryKeys[i]); }
const sorted = [...categoryKeys].sort((a, b) => estimateCategoryHeight(b) - estimateCategoryHeight(a));
for (const cat of sorted) {
let minIdx = 0;
for (let i = 1; i < cols; i++) {
if (heights[i] < heights[minIdx])
minIdx = i;
}
columns[minIdx].push(cat);
heights[minIdx] += estimateCategoryHeight(cat);
}
return columns; return columns;
} }
@@ -141,7 +165,7 @@ DankModal {
Column { Column {
id: masonryColumn id: masonryColumn
width: (rowLayout.width - rowLayout.spacing * (rowLayout.numColumns - 1)) / rowLayout.numColumns width: (rowLayout.width - rowLayout.spacing * (rowLayout.numColumns - 1)) / rowLayout.numColumns
spacing: Theme.spacingM spacing: Theme.spacingXL
Repeater { Repeater {
model: rowLayout.columnCategories[index] || [] model: rowLayout.columnCategories[index] || []
@@ -203,37 +227,37 @@ DankModal {
Repeater { Repeater {
model: parent.parent.subcatBinds model: parent.parent.subcatBinds
Row { Item {
width: parent.width width: parent.width
spacing: Theme.spacingS height: 24
StyledRect { StyledRect {
width: Math.min(140, parent.width * 0.42) id: keyBadge
width: Math.min(keyText.implicitWidth + 12, 160)
height: 22 height: 22
radius: 4 radius: 4
opacity: 0.9 anchors.verticalCenter: parent.verticalCenter
StyledText { StyledText {
id: keyText
anchors.centerIn: parent anchors.centerIn: parent
anchors.margins: 2
width: parent.width - 4
color: Theme.secondary color: Theme.secondary
text: modelData.key || "" text: modelData.key || ""
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
isMonospace: true isMonospace: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
} }
} }
StyledText { StyledText {
width: parent.width - 150 anchors.left: parent.left
anchors.leftMargin: 170
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: modelData.desc || modelData.action || "" text: modelData.desc || modelData.action || ""
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
opacity: 0.9 opacity: 0.9
elide: Text.ElideRight elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
} }
} }
} }

9
quickshell/Services/KeybindsService.qml
View File

@@ -233,11 +233,14 @@ Singleton {
loadBinds(true); loadBinds(true);
} }
function loadCheatsheet() { function loadCheatsheet(provider) {
if (cheatsheetProcess.running || !cheatsheetAvailable) if (cheatsheetProcess.running)
return;
const target = provider || cheatsheetProvider;
if (!target)
return; return;
cheatsheetLoading = true; cheatsheetLoading = true;
cheatsheetProcess.command = ["dms", "keybinds", "show", cheatsheetProvider]; cheatsheetProcess.command = ["dms", "keybinds", "show", target];
cheatsheetProcess.running = true; cheatsheetProcess.running = true;
} }