Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-27 15:02:50 -05:00
Code Packages Releases Activity

feat: Docks refactor - Top/Bottom options

Browse Source
This commit is contained in:
purian23
2025-09-28 23:55:59 -04:00
parent a3e2563f9b
commit bd8976c620
7 changed files with 479 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Modules/DankBar/DankBar.qml
View File

@@ -15,34 +15,40 @@ import qs.Modules.DankBar
import qs.Services
import qs.Widgets
PanelWindow {
id: root
Variants {
id: dankBarVariants
model: SettingsData.getFilteredScreens("dankBar")
WlrLayershell.namespace: "quickshell:bar"
signal colorPickerRequested()
property var modelData
property var notepadVariants: null
function getNotepadInstanceForScreen() {
if (typeof notepadSlideoutVariants === "undefined" || !notepadSlideoutVariants || !notepadSlideoutVariants.instances) {
return null
}
property bool gothCornersEnabled: SettingsData.dankBarGothCornersEnabled
for (var i = 0; i < notepadSlideoutVariants.instances.length; i++) {
var slideout = notepadSlideoutVariants.instances[i]
if (slideout.modelData && slideout.modelData.name === root.screen?.name) {
return slideout
}
}
return notepadSlideoutVariants.instances.length > 0 ? notepadSlideoutVariants.instances[0] : null
}
delegate: PanelWindow {
id: root
WlrLayershell.namespace: "quickshell:bar"
property var modelData: item
property bool gothCornersEnabled: SettingsData.dankBarGothCornersEnabled
property real wingtipsRadius: Theme.cornerRadius
readonly property real _wingR: Math.max(0, wingtipsRadius)
readonly property color _bgColor: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, topBarCore?.backgroundTransparency ?? SettingsData.dankBarTransparency)
readonly property real _dpr: (root.screen && root.screen.devicePixelRatio) ? root.screen.devicePixelRatio : 1
function px(v) { return Math.round(v * _dpr) / _dpr }
signal colorPickerRequested()
function getNotepadInstanceForScreen() {
if (!notepadVariants || !notepadVariants.instances) return null
for (var i = 0; i < notepadVariants.instances.length; i++) {
var slideout = notepadVariants.instances[i]
if (slideout.modelData && slideout.modelData.name === root.screen?.name) {
return slideout
}
}
return null
}
property string screenName: modelData.name
readonly property int notificationCount: NotificationService.notifications.length
readonly property real effectiveBarHeight: Math.max(root.widgetHeight + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
@@ -57,30 +63,9 @@ PanelWindow {
ToastService.showError("Please install Material Symbols Rounded and Restart your Shell. See README.md for instructions")
}
if (SettingsData.forceStatusBarLayoutRefresh) {
SettingsData.forceStatusBarLayoutRefresh.connect(() => {
Qt.callLater(() => {
leftSection.visible = false
centerSection.visible = false
rightSection.visible = false
Qt.callLater(() => {
leftSection.visible = true
centerSection.visible = true
rightSection.visible = true
})
})
})
}
updateGpuTempConfig()
Qt.callLater(() => Qt.callLater(forceWidgetRefresh))
}
function forceWidgetRefresh() {
const sections = [leftSection, centerSection, rightSection]
sections.forEach(section => section && (section.visible = false))
Qt.callLater(() => sections.forEach(section => section && (section.visible = true)))
}
function updateGpuTempConfig() {
const allWidgets = [...(SettingsData.dankBarLeftWidgets || []), ...(SettingsData.dankBarCenterWidgets || []), ...(SettingsData.dankBarRightWidgets || [])]
@@ -226,7 +211,7 @@ PanelWindow {
}
Component.onCompleted: {
notepadInstance = root.getNotepadInstanceForScreen()
notepadInstance = dankBarVariants.getNotepadInstanceForScreen()
}
Connections {
@@ -1284,7 +1269,7 @@ PanelWindow {
section: topBarContent.getWidgetSection(parent) || "right"
parentScreen: root.screen
onColorPickerRequested: {
root.colorPickerRequested()
dankBarVariants.colorPickerRequested()
}
}
}
@@ -1313,6 +1298,5 @@ PanelWindow {
}
}
}
}
}
}