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

migrate default font family props to Theme

Browse Source
This commit is contained in:
bbedward
2025-11-23 13:26:04 -05:00
parent d9522818ae
commit 2a002304b9
8 changed files with 1456 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
quickshell/Widgets/StyledText.qml
View File

@@ -1,6 +1,5 @@
import QtQuick
import qs.Common
import qs.Services
Text {
property bool isMonospace: false
@@ -16,13 +15,13 @@ Text {
}
readonly property string resolvedFontFamily: {
const requestedFont = isMonospace ? Theme.monoFontFamily : Theme.fontFamily
const defaultFont = isMonospace ? "Fira Code" : "Inter Variable"
const requestedFont = isMonospace ? Theme.monoFontFamily : Theme.fontFamily;
const defaultFont = isMonospace ? Theme.defaultMonoFontFamily : Theme.defaultFontFamily;
if (requestedFont === defaultFont) {
return isMonospace ? firaCodeFont.name : interFont.name
return isMonospace ? firaCodeFont.name : interFont.name;
}
return requestedFont
return requestedFont;
}
readonly property var standardAnimation: {
@@ -47,4 +46,4 @@ Text {
easing.bezierCurve: standardAnimation["easing.bezierCurve"]
}
}
}
}

12
quickshell/Widgets/StyledTextMetrics.qml
View File

@@ -6,19 +6,19 @@ TextMetrics {
property bool isMonospace: false
readonly property string resolvedFontFamily: {
const requestedFont = isMonospace ? SettingsData.monoFontFamily : SettingsData.fontFamily
const defaultFont = isMonospace ? SettingsData.defaultMonoFontFamily : SettingsData.defaultFontFamily
const requestedFont = isMonospace ? SettingsData.monoFontFamily : SettingsData.fontFamily;
const defaultFont = isMonospace ? Theme.defaultMonoFontFamily : Theme.defaultFontFamily;
if (requestedFont === defaultFont) {
const availableFonts = Qt.fontFamilies()
const availableFonts = Qt.fontFamilies();
if (!availableFonts.includes(requestedFont)) {
return isMonospace ? "Monospace" : "DejaVu Sans"
return isMonospace ? "Monospace" : "DejaVu Sans";
}
}
return requestedFont
return requestedFont;
}
font.pixelSize: Appearance.fontSize.normal
font.family: resolvedFontFamily
font.weight: SettingsData.fontWeight
}
}