mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-29 07:52:50 -05:00
Dont do dumb mono font filtering
This commit is contained in:
@@ -15,7 +15,6 @@ Item {
|
|||||||
property alias wallpaperBrowser: wallpaperBrowser
|
property alias wallpaperBrowser: wallpaperBrowser
|
||||||
property var parentModal: null
|
property var parentModal: null
|
||||||
property var cachedFontFamilies: []
|
property var cachedFontFamilies: []
|
||||||
property var cachedMonoFamilies: []
|
|
||||||
property bool fontsEnumerated: false
|
property bool fontsEnumerated: false
|
||||||
property string selectedMonitorName: {
|
property string selectedMonitorName: {
|
||||||
var screens = Quickshell.screens
|
var screens = Quickshell.screens
|
||||||
@@ -45,28 +44,6 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
cachedFontFamilies = fonts.concat(rootFamilies.sort())
|
cachedFontFamilies = fonts.concat(rootFamilies.sort())
|
||||||
var monoFonts = ["Default"]
|
|
||||||
var monoFamilies = []
|
|
||||||
var seenMonoFamilies = new Set()
|
|
||||||
for (var j = 0; j < availableFonts.length; j++) {
|
|
||||||
var fontName2 = availableFonts[j]
|
|
||||||
if (fontName2.startsWith("."))
|
|
||||||
continue
|
|
||||||
|
|
||||||
if (fontName2 === SettingsData.defaultMonoFontFamily)
|
|
||||||
continue
|
|
||||||
|
|
||||||
var lowerName = fontName2.toLowerCase()
|
|
||||||
if (lowerName.includes("mono") || lowerName.includes("code") || lowerName.includes("console") || lowerName.includes("terminal") || lowerName.includes("courier") || lowerName.includes("dejavu sans mono") || lowerName.includes(
|
|
||||||
"jetbrains") || lowerName.includes("fira") || lowerName.includes("hack") || lowerName.includes("source code") || lowerName.includes("ubuntu mono") || lowerName.includes("cascadia")) {
|
|
||||||
var rootName2 = fontName2.replace(/ (Thin|Extra Light|Light|Regular|Medium|Semi Bold|Demi Bold|Bold|Extra Bold|Black|Heavy)$/i, "").replace(/ (Italic|Oblique|Condensed|Extended|Narrow|Wide)$/i, "").trim()
|
|
||||||
if (!seenMonoFamilies.has(rootName2) && rootName2 !== "") {
|
|
||||||
seenMonoFamilies.add(rootName2)
|
|
||||||
monoFamilies.push(rootName2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cachedMonoFamilies = monoFonts.concat(monoFamilies.sort())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
@@ -1540,7 +1517,7 @@ Item {
|
|||||||
enableFuzzySearch: true
|
enableFuzzySearch: true
|
||||||
popupWidthOffset: 100
|
popupWidthOffset: 100
|
||||||
maxPopupHeight: 400
|
maxPopupHeight: 400
|
||||||
options: cachedMonoFamilies
|
options: cachedFontFamilies
|
||||||
onValueChanged: value => {
|
onValueChanged: value => {
|
||||||
if (value === "Default")
|
if (value === "Default")
|
||||||
SettingsData.setMonoFontFamily(SettingsData.defaultMonoFontFamily)
|
SettingsData.setMonoFontFamily(SettingsData.defaultMonoFontFamily)
|
||||||
|
|||||||
Reference in New Issue
Block a user