Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

update workspace indicators and qmlformat

Browse Source
This commit is contained in:
bbedward
2025-07-28 13:16:27 -04:00
parent 4581544585
commit b1db088828
16 changed files with 476 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/AppDrawer/AppLauncher.qml
View File

@@ -76,7 +76,7 @@ Item {
}
}
}
if (searchQuery.length === 0) {
if (searchQuery.length === 0)
apps = apps.sort(function(a, b) {
var aId = a.id || (a.execString || a.exec || "");
var bId = b.id || (b.execString || b.exec || "");
@@ -84,9 +84,10 @@ Item {
var bUsage = appUsageRanking[bId] ? appUsageRanking[bId].usageCount : 0;
if (aUsage !== bUsage)
return bUsage - aUsage;
return (a.name || "").localeCompare(b.name || "");
});
}
// Convert to model format and populate
apps.forEach((app) => {
if (app)

4
Modules/CentcomCenter/CentcomPopout.qml
View File

@@ -51,6 +51,8 @@ PanelWindow {
}
Rectangle {
// Animation finished, now we can safely resize
id: mainContainer
readonly property real targetWidth: Math.min(Screen.width * 0.9, 600)
@@ -98,8 +100,6 @@ PanelWindow {
y: Theme.barHeight + 4
// Only resize after animation is complete
onOpacityChanged: {
// Animation finished, now we can safely resize
if (opacity === 1)
Qt.callLater(() => {
height = calculateHeight();

143
Modules/Settings/AppearanceTab.qml
View File

@@ -97,9 +97,9 @@ ScrollView {
}
onValueChanged: (value) => {
Prefs.setIconTheme(value);
if (value !== "System Default" && !Prefs.qt5ctAvailable && !Prefs.qt6ctAvailable) {
if (value !== "System Default" && !Prefs.qt5ctAvailable && !Prefs.qt6ctAvailable)
ToastService.showWarning("qt5ct or qt6ct not found - Qt app themes may not update without these tools");
}
}
}
@@ -108,9 +108,9 @@ ScrollView {
text: "Font Family"
description: "Select system font family"
currentValue: {
if (Prefs.fontFamily === Prefs.defaultFontFamily) {
if (Prefs.fontFamily === Prefs.defaultFontFamily)
return "Default";
}
return Prefs.fontFamily || "Default";
}
enableFuzzySearch: true
@@ -119,49 +119,37 @@ ScrollView {
options: {
var fonts = ["Default"];
var availableFonts = Qt.fontFamilies();
var rootFamilies = [];
var seenFamilies = new Set();
// Filter to root family names by removing common weight/style suffixes
for (var i = 0; i < availableFonts.length; i++) {
var fontName = availableFonts[i];
// Skip fonts beginning with . (like .AppleSystem)
if (fontName.startsWith(".")) {
if (fontName.startsWith("."))
continue;
}
// Skip the default font since we already added it as recommended
if (fontName === Prefs.defaultFontFamily) {
if (fontName === Prefs.defaultFontFamily)
continue;
}
var rootName = fontName
.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, "")
.replace(/ (UI|Display|Text|Mono|Sans|Serif)$/i, function(match, suffix) {
var rootName = fontName.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, "").replace(/ (UI|Display|Text|Mono|Sans|Serif)$/i, function(match, suffix) {
// Keep these suffixes as they're part of the family name
return match;
})
.trim();
}).trim();
if (!seenFamilies.has(rootName) && rootName !== "") {
seenFamilies.add(rootName);
rootFamilies.push(rootName);
}
}
return fonts.concat(rootFamilies.sort());
}
onValueChanged: (value) => {
if (value === "Default") {
if (value === "Default")
Prefs.setFontFamily(Prefs.defaultFontFamily);
} else {
else
Prefs.setFontFamily(value);
}
}
}
DankDropdown {
width: parent.width
@@ -169,32 +157,62 @@ ScrollView {
description: "Select font weight"
currentValue: {
switch (Prefs.fontWeight) {
case Font.Thin: return "Thin";
case Font.ExtraLight: return "Extra Light";
case Font.Light: return "Light";
case Font.Normal: return "Regular";
case Font.Medium: return "Medium";
case Font.DemiBold: return "Demi Bold";
case Font.Bold: return "Bold";
case Font.ExtraBold: return "Extra Bold";
case Font.Black: return "Black";
default: return "Regular";
case Font.Thin:
return "Thin";
case Font.ExtraLight:
return "Extra Light";
case Font.Light:
return "Light";
case Font.Normal:
return "Regular";
case Font.Medium:
return "Medium";
case Font.DemiBold:
return "Demi Bold";
case Font.Bold:
return "Bold";
case Font.ExtraBold:
return "Extra Bold";
case Font.Black:
return "Black";
default:
return "Regular";
}
}
options: ["Thin", "Extra Light", "Light", "Regular", "Medium", "Demi Bold", "Bold", "Extra Bold", "Black"]
onValueChanged: (value) => {
var weight;
switch (value) {
case "Thin": weight = Font.Thin; break;
case "Extra Light": weight = Font.ExtraLight; break;
case "Light": weight = Font.Light; break;
case "Regular": weight = Font.Normal; break;
case "Medium": weight = Font.Medium; break;
case "Demi Bold": weight = Font.DemiBold; break;
case "Bold": weight = Font.Bold; break;
case "Extra Bold": weight = Font.ExtraBold; break;
case "Black": weight = Font.Black; break;
default: weight = Font.Normal; break;
case "Thin":
weight = Font.Thin;
break;
case "Extra Light":
weight = Font.ExtraLight;
break;
case "Light":
weight = Font.Light;
break;
case "Regular":
weight = Font.Normal;
break;
case "Medium":
weight = Font.Medium;
break;
case "Demi Bold":
weight = Font.DemiBold;
break;
case "Bold":
weight = Font.Bold;
break;
case "Extra Bold":
weight = Font.ExtraBold;
break;
case "Black":
weight = Font.Black;
break;
default:
weight = Font.Normal;
break;
}
Prefs.setFontWeight(weight);
}
@@ -205,9 +223,9 @@ ScrollView {
text: "Monospace Font"
description: "Select monospace font for process list and technical displays"
currentValue: {
if (Prefs.monoFontFamily === Prefs.defaultMonoFontFamily) {
if (Prefs.monoFontFamily === Prefs.defaultMonoFontFamily)
return "Default";
}
return Prefs.monoFontFamily || "Default";
}
enableFuzzySearch: true
@@ -216,62 +234,41 @@ ScrollView {
options: {
var fonts = ["Default"];
var availableFonts = Qt.fontFamilies();
var monoFamilies = [];
var seenFamilies = new Set();
// Filter to likely monospace fonts
for (var i = 0; i < availableFonts.length; i++) {
var fontName = availableFonts[i];
// Skip fonts beginning with .
if (fontName.startsWith(".")) {
if (fontName.startsWith("."))
continue;
}
// Skip the default mono font since we already added it as recommended
if (fontName === Prefs.defaultMonoFontFamily) {
if (fontName === Prefs.defaultMonoFontFamily)
continue;
}
// Look for common monospace indicators
var lowerName = fontName.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 rootName = fontName
.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 (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 rootName = fontName.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 (!seenFamilies.has(rootName) && rootName !== "") {
seenFamilies.add(rootName);
monoFamilies.push(rootName);
}
}
}
return fonts.concat(monoFamilies.sort());
}
onValueChanged: (value) => {
if (value === "Default") {
if (value === "Default")
Prefs.setMonoFontFamily(Prefs.defaultMonoFontFamily);
} else {
else
Prefs.setMonoFontFamily(value);
}
}
}
}
}
// Transparency Settings Section

1
Modules/Settings/TimeWeatherTab.qml
View File

@@ -133,6 +133,7 @@ ScrollView {
Prefs.setWeatherLocation(displayName, coordinates);
}
}
}
}

1
Modules/TopBar/Clock.qml
View File

@@ -18,7 +18,6 @@ Rectangle {
const baseColor = clockMouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceTextHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}
Component.onCompleted: {
root.currentDate = systemClock.date;
}

1
Modules/TopBar/CpuMonitor.qml
View File

@@ -19,7 +19,6 @@ Rectangle {
const baseColor = cpuArea.containsMouse ? Theme.primaryPressed : Theme.secondaryHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}
Component.onCompleted: {
SysMonitorService.addRef();
}

4
Modules/TopBar/FocusedApp.qml
View File

@@ -17,9 +17,9 @@ Rectangle {
radius: Theme.cornerRadius
color: {
// Only show background when there's content to display
if (!FocusedWindowService.focusedAppName && !FocusedWindowService.focusedWindowTitle) {
if (!FocusedWindowService.focusedAppName && !FocusedWindowService.focusedWindowTitle)
return "transparent";
}
const baseColor = mouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceTextHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}

2
Modules/TopBar/Media.qml
View File

@@ -22,7 +22,6 @@ Rectangle {
const baseColor = Theme.surfaceTextHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}
states: [
State {
name: "shown"
@@ -115,7 +114,6 @@ Rectangle {
title = activePlayer.trackTitle || "Unknown Track";
subtitle = activePlayer.trackArtist || "";
}
return subtitle.length > 0 ? title + " • " + subtitle : title;
}
font.pixelSize: Theme.fontSizeSmall

1
Modules/TopBar/RamMonitor.qml
View File

@@ -19,7 +19,6 @@ Rectangle {
const baseColor = ramArea.containsMouse ? Theme.primaryPressed : Theme.secondaryHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}
Component.onCompleted: {
SysMonitorService.addRef();
}

4
Modules/TopBar/SystemTrayBar.qml
View File

@@ -12,9 +12,9 @@ Rectangle {
radius: Theme.cornerRadius
color: {
// Only show background when there are system tray items to display
if (systemTrayRow.children.length === 0) {
if (systemTrayRow.children.length === 0)
return "transparent";
}
const baseColor = Theme.secondaryHover;
return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
}

6
Modules/TopBar/WorkspaceSwitcher.qml
View File

@@ -133,9 +133,9 @@ Rectangle {
visible: Prefs.showWorkspaceIndex
anchors.centerIn: parent
text: isPlaceholder ? sequentialNumber : sequentialNumber
color: isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceText
font.pixelSize: Theme.fontSizeMedium
font.bold: isActive && !isPlaceholder
color: isActive ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
font.pixelSize: Theme.fontSizeSmall
font.weight: isActive && !isPlaceholder ? Font.DemiBold : Font.Normal
}
Behavior on width {

3
Modules/VolumePopup.qml
View File

@@ -11,8 +11,6 @@ PanelWindow {
id: root
property var modelData
screen: modelData
property bool volumePopupVisible: false
function show() {
@@ -26,6 +24,7 @@ PanelWindow {
}
screen: modelData
visible: volumePopupVisible
WlrLayershell.layer: WlrLayershell.Overlay
WlrLayershell.exclusiveZone: -1

164
Widgets/DankDropdown.qml
View File

@@ -1,8 +1,8 @@
import "../Common/fuzzysort.js" as FuzzySort
import QtQuick
import QtQuick.Controls
import qs.Common
import qs.Widgets
import "../Common/fuzzysort.js" as FuzzySort
Rectangle {
id: root
@@ -23,14 +23,28 @@ Rectangle {
height: 60
radius: Theme.cornerRadius
color: Theme.surfaceHover
Component.onCompleted: {
// Force a small delay to ensure proper initialization
forceRecreateTimer.start();
}
Component.onDestruction: {
var popup = popupLoader.item;
if (popup && popup.visible)
popup.close();
}
onVisibleChanged: {
var popup = popupLoader.item;
if (!visible && popup && popup.visible)
popup.close();
else if (visible)
// Force recreate popup when component becomes visible
forceRecreateTimer.start();
}
Timer {
id: forceRecreateTimer
interval: 50
repeat: false
onTriggered: {
@@ -38,23 +52,6 @@ Rectangle {
}
}
Component.onDestruction: {
var popup = popupLoader.item;
if (popup && popup.visible) {
popup.close();
}
}
onVisibleChanged: {
var popup = popupLoader.item;
if (!visible && popup && popup.visible)
popup.close();
else if (visible) {
// Force recreate popup when component becomes visible
forceRecreateTimer.start();
}
}
Column {
anchors.left: parent.left
anchors.right: dropdown.left
@@ -160,8 +157,10 @@ Rectangle {
Loader {
id: popupLoader
active: true
property bool recreateFlag: root.forceRecreate
active: true
onRecreateFlagChanged: {
// Force recreation by toggling active
active = false;
@@ -176,60 +175,57 @@ Rectangle {
property var filteredOptions: []
property int selectedIndex: -1
parent: Overlay.overlay
width: dropdown.width + root.popupWidthOffset
height: Math.min(root.maxPopupHeight,
(root.enableFuzzySearch ? 48 : 0) +
Math.min(filteredOptions.length, 10) * 36 + 16)
padding: 0
modal: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
onOpened: {
searchQuery = ""
updateFilteredOptions()
if (root.enableFuzzySearch && searchField.visible) {
searchField.forceActiveFocus()
}
}
function updateFilteredOptions() {
if (!root.enableFuzzySearch || searchQuery.length === 0) {
filteredOptions = root.options
filteredOptions = root.options;
} else {
var results = FuzzySort.go(searchQuery, root.options, {
limit: 50,
threshold: -10000
})
"limit": 50,
"threshold": -10000
});
filteredOptions = results.map(function(result) {
return result.target
})
return result.target;
});
}
selectedIndex = -1
selectedIndex = -1;
}
function selectNext() {
if (filteredOptions.length > 0) {
selectedIndex = (selectedIndex + 1) % filteredOptions.length
listView.positionViewAtIndex(selectedIndex, ListView.Contain)
selectedIndex = (selectedIndex + 1) % filteredOptions.length;
listView.positionViewAtIndex(selectedIndex, ListView.Contain);
}
}
function selectPrevious() {
if (filteredOptions.length > 0) {
selectedIndex = selectedIndex <= 0 ? filteredOptions.length - 1 : selectedIndex - 1
listView.positionViewAtIndex(selectedIndex, ListView.Contain)
selectedIndex = selectedIndex <= 0 ? filteredOptions.length - 1 : selectedIndex - 1;
listView.positionViewAtIndex(selectedIndex, ListView.Contain);
}
}
function selectCurrent() {
if (selectedIndex >= 0 && selectedIndex < filteredOptions.length) {
root.currentValue = filteredOptions[selectedIndex]
root.valueChanged(filteredOptions[selectedIndex])
dropdownMenu.close()
root.currentValue = filteredOptions[selectedIndex];
root.valueChanged(filteredOptions[selectedIndex]);
dropdownMenu.close();
}
}
parent: Overlay.overlay
width: dropdown.width + root.popupWidthOffset
height: Math.min(root.maxPopupHeight, (root.enableFuzzySearch ? 48 : 0) + Math.min(filteredOptions.length, 10) * 36 + 16)
padding: 0
modal: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
onOpened: {
searchQuery = "";
updateFilteredOptions();
if (root.enableFuzzySearch && searchField.visible)
searchField.forceActiveFocus();
}
background: Rectangle {
color: "transparent"
}
@@ -247,6 +243,7 @@ Rectangle {
// Search field
Rectangle {
id: searchContainer
width: parent.width
height: 36
visible: root.enableFuzzySearch
@@ -255,6 +252,7 @@ Rectangle {
DankTextField {
id: searchField
anchors.fill: parent
anchors.margins: 1
placeholderText: "Search..."
@@ -262,15 +260,15 @@ Rectangle {
topPadding: Theme.spacingS
bottomPadding: Theme.spacingS
onTextChanged: {
dropdownMenu.searchQuery = text
dropdownMenu.updateFilteredOptions()
dropdownMenu.searchQuery = text;
dropdownMenu.updateFilteredOptions();
}
Keys.onDownPressed: dropdownMenu.selectNext()
Keys.onUpPressed: dropdownMenu.selectPrevious()
Keys.onReturnPressed: dropdownMenu.selectCurrent()
Keys.onEnterPressed: dropdownMenu.selectCurrent()
}
}
Item {
@@ -281,34 +279,37 @@ Rectangle {
ListView {
id: listView
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
width: parent.width
height: parent.height - (root.enableFuzzySearch ? searchContainer.height + Theme.spacingXS : 0)
clip: true
model: dropdownMenu.filteredOptions
spacing: 2
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
ScrollBar.horizontal: ScrollBar { policy: ScrollBar.AlwaysOff }
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
WheelHandler {
target: null
onWheel: (ev) => {
let dy = ev.pixelDelta.y !== 0
? ev.pixelDelta.y
: (ev.angleDelta.y / 120) * parent.wheelBaseStep;
if (ev.inverted) dy = -dy;
let dy = ev.pixelDelta.y !== 0 ? ev.pixelDelta.y : (ev.angleDelta.y / 120) * parent.wheelBaseStep;
if (ev.inverted)
dy = -dy;
const maxY = Math.max(0, parent.contentHeight - parent.height);
parent.contentY = Math.max(0, Math.min(maxY,
parent.contentY - dy * parent.wheelMultiplier));
parent.contentY = Math.max(0, Math.min(maxY, parent.contentY - dy * parent.wheelMultiplier));
ev.accepted = true;
}
}
ScrollBar.vertical: ScrollBar {
policy: ScrollBar.AsNeeded
}
ScrollBar.horizontal: ScrollBar {
policy: ScrollBar.AlwaysOff
}
delegate: Rectangle {
property bool isSelected: dropdownMenu.selectedIndex === index
property bool isCurrentValue: root.currentValue === modelData
@@ -317,8 +318,7 @@ Rectangle {
width: ListView.view.width
height: 32
radius: Theme.cornerRadiusSmall
color: isSelected ? Theme.primaryHover :
optionArea.containsMouse ? Theme.primaryHoverLight : "transparent"
color: isSelected ? Theme.primaryHover : optionArea.containsMouse ? Theme.primaryHoverLight : "transparent"
Row {
anchors.left: parent.left
@@ -327,8 +327,7 @@ Rectangle {
spacing: Theme.spacingS
DankIcon {
name: optionIndex >= 0 && root.optionIcons.length > optionIndex ?
root.optionIcons[optionIndex] : ""
name: optionIndex >= 0 && root.optionIcons.length > optionIndex ? root.optionIcons[optionIndex] : ""
size: 18
color: isCurrentValue ? Theme.primary : Theme.surfaceVariantText
visible: name !== ""
@@ -343,6 +342,7 @@ Rectangle {
width: parent.parent.width - parent.x - Theme.spacingS
elide: Text.ElideRight
}
}
MouseArea {
@@ -352,18 +352,24 @@ Rectangle {
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
root.currentValue = modelData
root.valueChanged(modelData)
dropdownMenu.close()
}
}
}
}
root.currentValue = modelData;
root.valueChanged(modelData);
dropdownMenu.close();
}
}
}
}
}
}
}
}
}
}
}

56
Widgets/DankGridView.qml
View File

@@ -6,6 +6,7 @@ import qs.Common
GridView {
id: gridView
property int currentIndex: 0
property int columns: 4
property bool adaptiveColumns: false
@@ -17,6 +18,12 @@ GridView {
property int minIconSize: 32
property bool hoverUpdatesSelection: true
property bool keyboardNavigationActive: false
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
property int baseCellWidth: adaptiveColumns ? Math.max(minCellWidth, Math.min(maxCellWidth, width / columns)) : (width - Theme.spacingS * 2) / columns
property int baseCellHeight: baseCellWidth + 20
property int actualColumns: adaptiveColumns ? Math.floor(width / cellWidth) : columns
property int remainingSpace: width - (actualColumns * cellWidth)
signal keyboardNavigationReset()
signal itemClicked(int index, var modelData)
@@ -41,34 +48,6 @@ GridView {
}
clip: true
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
ScrollBar.horizontal: ScrollBar { policy: ScrollBar.AlwaysOff }
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
WheelHandler {
target: null
onWheel: (ev) => {
let dy = ev.pixelDelta.y !== 0
? ev.pixelDelta.y
: (ev.angleDelta.y / 120) * gridView.wheelBaseStep;
if (ev.inverted) dy = -dy;
const maxY = Math.max(0, gridView.contentHeight - gridView.height);
gridView.contentY = Math.max(0, Math.min(maxY,
gridView.contentY - dy * gridView.wheelMultiplier));
ev.accepted = true;
}
}
property int baseCellWidth: adaptiveColumns ? Math.max(minCellWidth, Math.min(maxCellWidth, width / columns)) : (width - Theme.spacingS * 2) / columns
property int baseCellHeight: baseCellWidth + 20
property int actualColumns: adaptiveColumns ? Math.floor(width / cellWidth) : columns
property int remainingSpace: width - (actualColumns * cellWidth)
anchors.margins: Theme.spacingS
cellWidth: baseCellWidth
cellHeight: baseCellHeight
@@ -79,6 +58,27 @@ GridView {
flickDeceleration: 300
maximumFlickVelocity: 30000
WheelHandler {
target: null
onWheel: (ev) => {
let dy = ev.pixelDelta.y !== 0 ? ev.pixelDelta.y : (ev.angleDelta.y / 120) * gridView.wheelBaseStep;
if (ev.inverted)
dy = -dy;
const maxY = Math.max(0, gridView.contentHeight - gridView.height);
gridView.contentY = Math.max(0, Math.min(maxY, gridView.contentY - dy * gridView.wheelMultiplier));
ev.accepted = true;
}
}
ScrollBar.vertical: ScrollBar {
policy: ScrollBar.AsNeeded
}
ScrollBar.horizontal: ScrollBar {
policy: ScrollBar.AlwaysOff
}
delegate: Rectangle {
width: gridView.cellWidth - cellPadding
height: gridView.cellHeight - cellPadding

47
Widgets/DankListView.qml
View File

@@ -6,6 +6,7 @@ import qs.Common
ListView {
id: listView
property int currentIndex: 0
property int itemHeight: 72
property int iconSize: 56
@@ -13,6 +14,8 @@ ListView {
property int itemSpacing: Theme.spacingS
property bool hoverUpdatesSelection: true
property bool keyboardNavigationActive: false
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
signal keyboardNavigationReset()
signal itemClicked(int index, var modelData)
@@ -37,29 +40,6 @@ ListView {
}
clip: true
ScrollBar.vertical: ScrollBar { policy: ScrollBar.AlwaysOn }
ScrollBar.horizontal: ScrollBar { policy: ScrollBar.AlwaysOff }
property real wheelMultiplier: 1.8
property int wheelBaseStep: 160
WheelHandler {
target: null
onWheel: (ev) => {
let dy = ev.pixelDelta.y !== 0
? ev.pixelDelta.y
: (ev.angleDelta.y / 120) * listView.wheelBaseStep;
if (ev.inverted) dy = -dy;
const maxY = Math.max(0, listView.contentHeight - listView.height);
listView.contentY = Math.max(0, Math.min(maxY,
listView.contentY - dy * listView.wheelMultiplier));
ev.accepted = true;
}
}
anchors.margins: itemSpacing
spacing: itemSpacing
focus: true
@@ -67,6 +47,27 @@ ListView {
flickDeceleration: 600
maximumFlickVelocity: 30000
WheelHandler {
target: null
onWheel: (ev) => {
let dy = ev.pixelDelta.y !== 0 ? ev.pixelDelta.y : (ev.angleDelta.y / 120) * listView.wheelBaseStep;
if (ev.inverted)
dy = -dy;
const maxY = Math.max(0, listView.contentHeight - listView.height);
listView.contentY = Math.max(0, Math.min(maxY, listView.contentY - dy * listView.wheelMultiplier));
ev.accepted = true;
}
}
ScrollBar.vertical: ScrollBar {
policy: ScrollBar.AlwaysOn
}
ScrollBar.horizontal: ScrollBar {
policy: ScrollBar.AlwaysOff
}
delegate: Rectangle {
width: listView.width
height: itemHeight

16
Widgets/StyledText.qml
View File

@@ -10,20 +10,18 @@ Text {
color: Theme.surfaceText
font.pixelSize: Appearance.fontSize.normal
font.family: {
var requestedFont = isMonospace ? Prefs.monoFontFamily : Prefs.fontFamily
var defaultFont = isMonospace ? Prefs.defaultMonoFontFamily : Prefs.defaultFontFamily
var requestedFont = isMonospace ? Prefs.monoFontFamily : Prefs.fontFamily;
var defaultFont = isMonospace ? Prefs.defaultMonoFontFamily : Prefs.defaultFontFamily;
// If user hasn't overridden the font and we're using the default
if (requestedFont === defaultFont) {
var availableFonts = Qt.fontFamilies()
if (!availableFonts.includes(requestedFont)) {
var availableFonts = Qt.fontFamilies();
if (!availableFonts.includes(requestedFont))
// Use system default
return isMonospace ? "Monospace" : "DejaVu Sans"
}
}
return isMonospace ? "Monospace" : "DejaVu Sans";
}
// Either user overrode it, or default font is available
return requestedFont
return requestedFont;
}
font.weight: Prefs.fontWeight
wrapMode: Text.WordWrap