diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 6c5162dd3..bbdb6f71d 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -1250,6 +1250,7 @@ Singleton { return typeof SettingsData !== "undefined" ? SettingsData.fontScale : 1.0; } + property real spacingXXS: 2 property real spacingXS: 4 property real spacingS: 8 property real spacingM: 12 diff --git a/quickshell/Modals/AppPickerModal.qml b/quickshell/Modals/AppPickerModal.qml index 598fe164e..a964f2513 100644 --- a/quickshell/Modals/AppPickerModal.qml +++ b/quickshell/Modals/AppPickerModal.qml @@ -253,7 +253,7 @@ DankModal { } Row { - spacing: 4 + spacing: Theme.spacingXS anchors.right: parent.right anchors.rightMargin: Theme.spacingS anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modals/BluetoothPairingModal.qml b/quickshell/Modals/BluetoothPairingModal.qml index 9a5ea41d2..f5cdbf2e1 100644 --- a/quickshell/Modals/BluetoothPairingModal.qml +++ b/quickshell/Modals/BluetoothPairingModal.qml @@ -224,7 +224,7 @@ DankModal { Column { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Passkey:") diff --git a/quickshell/Modals/Changelog/ChangelogFeatureCard.qml b/quickshell/Modals/Changelog/ChangelogFeatureCard.qml index eab4f701e..4f13d01e9 100644 --- a/quickshell/Modals/Changelog/ChangelogFeatureCard.qml +++ b/quickshell/Modals/Changelog/ChangelogFeatureCard.qml @@ -48,7 +48,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - root.iconContainerSize - Theme.spacingS StyledText { diff --git a/quickshell/Modals/Clipboard/ClipboardKeyboardHints.qml b/quickshell/Modals/Clipboard/ClipboardKeyboardHints.qml index 4f901a578..001633adf 100644 --- a/quickshell/Modals/Clipboard/ClipboardKeyboardHints.qml +++ b/quickshell/Modals/Clipboard/ClipboardKeyboardHints.qml @@ -24,7 +24,7 @@ Rectangle { Column { width: parent.width - Theme.spacingL * 2 anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: keyboardHints.enterToPaste ? I18n.tr("↑/↓: Navigate • Enter: Paste • Ctrl+C: Copy • Del: Delete • Ctrl+E: Edit • Ctrl+S: Pin/Unpin • F10: Help", "Keyboard hints when enter-to-paste is enabled") : I18n.tr("↑/↓: Navigate • Enter/Ctrl+C: Copy • Del: Delete • Ctrl+E: Edit • Ctrl+S: Pin/Unpin • F10: Help") diff --git a/quickshell/Modals/DankLauncherV2/LauncherContent.qml b/quickshell/Modals/DankLauncherV2/LauncherContent.qml index 1292f60de..5b793512a 100644 --- a/quickshell/Modals/DankLauncherV2/LauncherContent.qml +++ b/quickshell/Modals/DankLauncherV2/LauncherContent.qml @@ -351,7 +351,7 @@ FocusScope { anchors.leftMargin: Theme.spacingM anchors.verticalCenter: parent.verticalCenter layoutDirection: I18n.isRtl ? Qt.RightToLeft : Qt.LeftToRight - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: [ @@ -639,7 +639,7 @@ FocusScope { Row { id: typeChips anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS visible: DSearchService.supportsTypeFilter Repeater { @@ -878,7 +878,7 @@ FocusScope { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Edit App") @@ -915,7 +915,7 @@ FocusScope { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Name") @@ -935,7 +935,7 @@ FocusScope { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Icon") @@ -955,7 +955,7 @@ FocusScope { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Description") @@ -975,7 +975,7 @@ FocusScope { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Environment Variables") @@ -1001,7 +1001,7 @@ FocusScope { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Extra Arguments") diff --git a/quickshell/Modals/DankLauncherV2/Section.qml b/quickshell/Modals/DankLauncherV2/Section.qml index 5daea0b1a..babae69ab 100644 --- a/quickshell/Modals/DankLauncherV2/Section.qml +++ b/quickshell/Modals/DankLauncherV2/Section.qml @@ -50,7 +50,7 @@ Item { id: listComponent Column { - spacing: 4 + spacing: Theme.spacingXS width: contentLoader.width Repeater { @@ -83,7 +83,7 @@ Item { Flow { width: contentLoader.width - spacing: 4 + spacing: Theme.spacingXS Repeater { model: ScriptModel { diff --git a/quickshell/Modals/DankLauncherV2/SectionHeader.qml b/quickshell/Modals/DankLauncherV2/SectionHeader.qml index e039f8957..f5db4ef7e 100644 --- a/quickshell/Modals/DankLauncherV2/SectionHeader.qml +++ b/quickshell/Modals/DankLauncherV2/SectionHeader.qml @@ -169,7 +169,7 @@ Rectangle { anchors.fill: parent anchors.margins: Theme.spacingS model: root.controller?.appCategories ?? [] - spacing: 2 + spacing: Theme.spacingXXS clip: true interactive: contentHeight > height implicitHeight: contentHeight @@ -246,7 +246,7 @@ Rectangle { Row { id: viewModeRow anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS visible: root.canChangeViewMode && !root.section?.collapsed Repeater { diff --git a/quickshell/Modals/DankLauncherV2/SpotlightResultRow.qml b/quickshell/Modals/DankLauncherV2/SpotlightResultRow.qml index a77351079..45da2b929 100644 --- a/quickshell/Modals/DankLauncherV2/SpotlightResultRow.qml +++ b/quickshell/Modals/DankLauncherV2/SpotlightResultRow.qml @@ -150,7 +150,7 @@ Rectangle { anchors.right: previewFrame.visible ? previewFrame.left : metaRow.left anchors.rightMargin: Theme.spacingM anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { id: nameText diff --git a/quickshell/Modals/DankLauncherV2/SpotlightResultsList.qml b/quickshell/Modals/DankLauncherV2/SpotlightResultsList.qml index 93da2a44f..bc004a427 100644 --- a/quickshell/Modals/DankLauncherV2/SpotlightResultsList.qml +++ b/quickshell/Modals/DankLauncherV2/SpotlightResultsList.qml @@ -143,7 +143,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter width: Math.min(420, root.width - 88) - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width diff --git a/quickshell/Modals/FileBrowser/FileBrowserContent.qml b/quickshell/Modals/FileBrowser/FileBrowserContent.qml index 006a601b0..9667ad73e 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserContent.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserContent.qml @@ -804,7 +804,7 @@ FocusScope { anchors.topMargin: Theme.spacingS anchors.bottomMargin: Theme.spacingS visible: viewMode === "list" - spacing: 2 + spacing: Theme.spacingXXS model: folderModel currentIndex: selectedIndex onCurrentIndexChanged: { diff --git a/quickshell/Modals/FileBrowser/FileBrowserSidebar.qml b/quickshell/Modals/FileBrowser/FileBrowserSidebar.qml index 99a3d87f7..74dd459b6 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserSidebar.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserSidebar.qml @@ -16,7 +16,7 @@ StyledRect { Column { anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Quick Access") diff --git a/quickshell/Modals/FileBrowser/KeyboardHints.qml b/quickshell/Modals/FileBrowser/KeyboardHints.qml index e4f10f4a2..56e50533d 100644 --- a/quickshell/Modals/FileBrowser/KeyboardHints.qml +++ b/quickshell/Modals/FileBrowser/KeyboardHints.qml @@ -20,7 +20,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select") diff --git a/quickshell/Modals/Greeter/GreeterCompletePage.qml b/quickshell/Modals/Greeter/GreeterCompletePage.qml index 45bb3cb12..33877c8bb 100644 --- a/quickshell/Modals/Greeter/GreeterCompletePage.qml +++ b/quickshell/Modals/Greeter/GreeterCompletePage.qml @@ -99,7 +99,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("You're All Set!", "greeter completion page title") diff --git a/quickshell/Modals/Greeter/GreeterDoctorPage.qml b/quickshell/Modals/Greeter/GreeterDoctorPage.qml index 73c29c7cd..b93821f95 100644 --- a/quickshell/Modals/Greeter/GreeterDoctorPage.qml +++ b/quickshell/Modals/Greeter/GreeterDoctorPage.qml @@ -209,7 +209,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("System Check", "greeter doctor page title") diff --git a/quickshell/Modals/Greeter/GreeterFeatureCard.qml b/quickshell/Modals/Greeter/GreeterFeatureCard.qml index a5bf4f493..5a1ba94b8 100644 --- a/quickshell/Modals/Greeter/GreeterFeatureCard.qml +++ b/quickshell/Modals/Greeter/GreeterFeatureCard.qml @@ -45,7 +45,7 @@ Rectangle { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: root.title diff --git a/quickshell/Modals/Greeter/GreeterSettingsCard.qml b/quickshell/Modals/Greeter/GreeterSettingsCard.qml index 85e6b1cfc..804f4ca0f 100644 --- a/quickshell/Modals/Greeter/GreeterSettingsCard.qml +++ b/quickshell/Modals/Greeter/GreeterSettingsCard.qml @@ -48,7 +48,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - root.iconContainerSize - Theme.spacingM StyledText { diff --git a/quickshell/Modals/MuxModal.qml b/quickshell/Modals/MuxModal.qml index 292ec84f5..ccd205087 100644 --- a/quickshell/Modals/MuxModal.qml +++ b/quickshell/Modals/MuxModal.qml @@ -361,7 +361,7 @@ DankModal { Column { Layout.fillWidth: true - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("New Session") @@ -449,7 +449,7 @@ DankModal { // Info Column { Layout.fillWidth: true - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name @@ -601,7 +601,7 @@ DankModal { delegate: Row { required property var modelData - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: keyText.width + Theme.spacingS diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml index cab0a7b2c..83bdb7430 100644 --- a/quickshell/Modals/ProcessListModal.qml +++ b/quickshell/Modals/ProcessListModal.qml @@ -300,7 +300,7 @@ FloatingWindow { spacing: Theme.spacingM Row { - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: [ diff --git a/quickshell/Modals/Settings/ProfileSection.qml b/quickshell/Modals/Settings/ProfileSection.qml index 29b49618e..7a485b95e 100644 --- a/quickshell/Modals/Settings/ProfileSection.qml +++ b/quickshell/Modals/Settings/ProfileSection.qml @@ -52,7 +52,7 @@ Rectangle { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 28 diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml index 08a8de23b..20a8a9a6d 100644 --- a/quickshell/Modals/Settings/SettingsSidebar.qml +++ b/quickshell/Modals/Settings/SettingsSidebar.qml @@ -711,7 +711,7 @@ Rectangle { rightPadding: Theme.spacingS bottomPadding: Theme.spacingL topPadding: Theme.spacingM + 2 - spacing: 2 + spacing: Theme.spacingXXS ProfileSection { width: parent.width - parent.leftPadding - parent.rightPadding @@ -804,7 +804,7 @@ Rectangle { Column { id: searchResultsColumn width: parent.width - parent.leftPadding - parent.rightPadding - spacing: 2 + spacing: Theme.spacingXXS visible: root.searchActive Item { @@ -859,7 +859,7 @@ Rectangle { Column { width: parent.width - Theme.iconSize - Theme.spacingM anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: resultDelegate.modelData.label @@ -928,7 +928,7 @@ Rectangle { width: parent.width - parent.leftPadding - parent.rightPadding visible: !root.searchActive && root.isCategoryVisible(modelData) - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -1035,7 +1035,7 @@ Rectangle { Column { id: childrenColumn width: parent.width - spacing: 2 + spacing: Theme.spacingXXS visible: categoryDelegate.modelData.children !== undefined && root.isCategoryExpanded(categoryDelegate.modelData.id) clip: true diff --git a/quickshell/Modals/SwitchUserModal.qml b/quickshell/Modals/SwitchUserModal.qml index c26f42009..5491f45f8 100644 --- a/quickshell/Modals/SwitchUserModal.qml +++ b/quickshell/Modals/SwitchUserModal.qml @@ -141,7 +141,7 @@ DankModal { Column { width: parent.width - Theme.iconSize - 4 - chevron.width - Theme.spacingM * 2 - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter StyledText { @@ -215,7 +215,7 @@ DankModal { Column { id: bodyCol width: parent.width - Theme.iconSize - Theme.spacingM - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("No other active sessions on this seat") diff --git a/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml b/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml index a030e4d50..4156a0f0f 100644 --- a/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml +++ b/quickshell/Modules/BuiltinDesktopPlugins/SystemMonitorWidget.qml @@ -447,7 +447,7 @@ Item { ColumnLayout { anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS RowLayout { Layout.fillWidth: true diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml index b4469bd0c..da961ce93 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml @@ -274,7 +274,7 @@ PluginComponent { } Column { - spacing: 2 + spacing: Theme.spacingXXS Layout.alignment: Qt.AlignVCenter Layout.fillWidth: true diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml index ffbb76cd8..fb9b19c66 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/DisplayProfilesWidget.qml @@ -234,7 +234,7 @@ PluginComponent { verticalBarPill: Component { Column { - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: "monitor" color: Theme.primary diff --git a/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml b/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml index f598762b4..855d92efb 100644 --- a/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml +++ b/quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml @@ -344,7 +344,7 @@ PluginComponent { anchors.right: parent.right anchors.top: parent.top anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS RowLayout { width: parent.width @@ -419,7 +419,7 @@ PluginComponent { Column { visible: isExpanded width: parent.width - spacing: 2 + spacing: Theme.spacingXXS topPadding: 4 RowLayout { diff --git a/quickshell/Modules/ControlCenter/Components/ActionTile.qml b/quickshell/Modules/ControlCenter/Components/ActionTile.qml index ebae72aa4..2f8bc47a2 100644 --- a/quickshell/Modules/ControlCenter/Components/ActionTile.qml +++ b/quickshell/Modules/ControlCenter/Components/ActionTile.qml @@ -74,7 +74,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS Typography { width: parent.width diff --git a/quickshell/Modules/ControlCenter/Components/DiskUsageWidgetConfigMenu.qml b/quickshell/Modules/ControlCenter/Components/DiskUsageWidgetConfigMenu.qml index 25cd32c63..f52d7c10e 100644 --- a/quickshell/Modules/ControlCenter/Components/DiskUsageWidgetConfigMenu.qml +++ b/quickshell/Modules/ControlCenter/Components/DiskUsageWidgetConfigMenu.qml @@ -24,7 +24,7 @@ Rectangle { id: menuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS DankToggle { width: parent.width diff --git a/quickshell/Modules/ControlCenter/Components/EditControls.qml b/quickshell/Modules/ControlCenter/Components/EditControls.qml index 3b3cee653..01ff67c9e 100644 --- a/quickshell/Modules/ControlCenter/Components/EditControls.qml +++ b/quickshell/Modules/ControlCenter/Components/EditControls.qml @@ -170,7 +170,7 @@ Row { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - Theme.iconSize * 2 - Theme.spacingM * 3 Typography { diff --git a/quickshell/Modules/ControlCenter/Components/HeaderPane.qml b/quickshell/Modules/ControlCenter/Components/HeaderPane.qml index d0af2d79e..4e4ac6242 100644 --- a/quickshell/Modules/ControlCenter/Components/HeaderPane.qml +++ b/quickshell/Modules/ControlCenter/Components/HeaderPane.qml @@ -51,7 +51,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS Typography { text: UserInfoService.fullName || UserInfoService.username || I18n.tr("User") diff --git a/quickshell/Modules/ControlCenter/Components/SizeControls.qml b/quickshell/Modules/ControlCenter/Components/SizeControls.qml index 3c2577df6..bc9d66398 100644 --- a/quickshell/Modules/ControlCenter/Components/SizeControls.qml +++ b/quickshell/Modules/ControlCenter/Components/SizeControls.qml @@ -13,7 +13,7 @@ Row { readonly property var availableSizes: isSlider ? [50, 75, 100] : [25, 50, 75, 100] - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: root.availableSizes diff --git a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml index 4877ba534..bbf3cd3b7 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml @@ -279,7 +279,7 @@ Rectangle { Row { id: pinInputRow anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "push_pin" diff --git a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml index b54f86dba..390dd7a05 100644 --- a/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml @@ -288,7 +288,7 @@ Rectangle { Row { id: pinOutputRow anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "push_pin" diff --git a/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml b/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml index d7b825434..f52557492 100644 --- a/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml +++ b/quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml @@ -197,7 +197,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: device ? (device.name || device.deviceName) : "" @@ -266,7 +266,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name diff --git a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml index 27cfb737c..7f8b2b52b 100644 --- a/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml @@ -344,7 +344,7 @@ Rectangle { Row { id: pinBluetoothRow anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "push_pin" diff --git a/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml b/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml index ab8fab09d..d75a48d08 100644 --- a/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml @@ -226,7 +226,7 @@ Rectangle { Row { id: globalPinRow anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "push_pin" @@ -304,7 +304,7 @@ Rectangle { Column { id: deviceIconColumn anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: { @@ -502,7 +502,7 @@ Rectangle { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "show_chart" diff --git a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml index b8009ae92..3e5d8c3ab 100644 --- a/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml @@ -91,7 +91,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: "storage" diff --git a/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml b/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml index 37230f233..7613f7eaf 100644 --- a/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/DoNotDisturbDetail.qml @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter width: parent.width - Theme.iconSizeLarge - Theme.spacingM - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Silence notifications") diff --git a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml index 21b067033..80839326e 100644 --- a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml @@ -683,7 +683,7 @@ Rectangle { Row { id: pinWifiRow anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: "push_pin" diff --git a/quickshell/Modules/ControlCenter/Widgets/CompoundPill.qml b/quickshell/Modules/ControlCenter/Widgets/CompoundPill.qml index 34b1e416c..50f910b8e 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CompoundPill.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CompoundPill.qml @@ -146,7 +146,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width diff --git a/quickshell/Modules/ControlCenter/Widgets/SmallBatteryButton.qml b/quickshell/Modules/ControlCenter/Widgets/SmallBatteryButton.qml index feb03573a..0eb730f8c 100644 --- a/quickshell/Modules/ControlCenter/Widgets/SmallBatteryButton.qml +++ b/quickshell/Modules/ControlCenter/Widgets/SmallBatteryButton.qml @@ -60,7 +60,7 @@ Rectangle { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS DankIcon { name: BatteryService.getBatteryIcon() diff --git a/quickshell/Modules/ControlCenter/Widgets/ToggleButton.qml b/quickshell/Modules/ControlCenter/Widgets/ToggleButton.qml index fbd8709ab..6042b0cb2 100644 --- a/quickshell/Modules/ControlCenter/Widgets/ToggleButton.qml +++ b/quickshell/Modules/ControlCenter/Widgets/ToggleButton.qml @@ -82,7 +82,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width diff --git a/quickshell/Modules/DankBar/Popouts/BatteryPopout.qml b/quickshell/Modules/DankBar/Popouts/BatteryPopout.qml index b8e096345..a81507107 100644 --- a/quickshell/Modules/DankBar/Popouts/BatteryPopout.qml +++ b/quickshell/Modules/DankBar/Popouts/BatteryPopout.qml @@ -447,7 +447,7 @@ DankPopout { Column { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Health") @@ -484,7 +484,7 @@ DankPopout { Column { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Capacity") @@ -513,7 +513,7 @@ DankPopout { Column { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.state === UPowerDeviceState.Charging ? I18n.tr("To Full") : modelData.state === UPowerDeviceState.Discharging ? I18n.tr("Left") : "" diff --git a/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml b/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml index d67d48699..2f553b817 100644 --- a/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml +++ b/quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml @@ -245,7 +245,7 @@ DankPopout { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: root.getLayoutName(modelData) diff --git a/quickshell/Modules/DankBar/Popouts/SystemUpdatePopout.qml b/quickshell/Modules/DankBar/Popouts/SystemUpdatePopout.qml index e03a20583..78527274d 100644 --- a/quickshell/Modules/DankBar/Popouts/SystemUpdatePopout.qml +++ b/quickshell/Modules/DankBar/Popouts/SystemUpdatePopout.qml @@ -351,7 +351,7 @@ DankPopout { Column { anchors.verticalCenter: parent.verticalCenter width: parent.width - 64 - Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width @@ -364,7 +364,7 @@ DankPopout { Row { width: parent.width - spacing: 4 + spacing: Theme.spacingXS StyledText { text: { diff --git a/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml b/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml index 823d5bd2f..2f61d01b2 100644 --- a/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml +++ b/quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml @@ -755,7 +755,7 @@ BasePill { anchors.left: parent.left anchors.leftMargin: 1 anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankIcon { id: audioIcon @@ -792,7 +792,7 @@ BasePill { anchors.left: parent.left anchors.leftMargin: 1 anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankIcon { id: micIcon @@ -829,7 +829,7 @@ BasePill { anchors.left: parent.left anchors.leftMargin: 1 anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankIcon { id: brightnessIcon diff --git a/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml b/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml index c695fc599..69ab31f46 100644 --- a/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml +++ b/quickshell/Modules/DankBar/Widgets/NetworkMonitor.qml @@ -34,7 +34,7 @@ BasePill { Column { id: contentColumn anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS visible: root.isVerticalOrientation DankIcon { @@ -88,7 +88,7 @@ BasePill { Row { anchors.verticalCenter: parent.verticalCenter - spacing: 4 + spacing: Theme.spacingXS StyledText { text: "↓" @@ -117,7 +117,7 @@ BasePill { Row { anchors.verticalCenter: parent.verticalCenter - spacing: 4 + spacing: Theme.spacingXS StyledText { text: "↑" diff --git a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml index e62c22db3..25ee231ec 100644 --- a/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml +++ b/quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml @@ -1331,7 +1331,7 @@ BasePill { anchors.verticalCenter: menuContainer.popupUsesVerticalLine ? undefined : parent.verticalCenter anchors.horizontalCenter: menuContainer.popupUsesVerticalLine ? parent.horizontalCenter : undefined columns: menuContainer.popupUsesVerticalLine ? 1 : (root.useSingleLineOverflowPopup ? root.hiddenBarItems.length : Math.min(5, root.hiddenBarItems.length)) - spacing: 2 + spacing: Theme.spacingXXS rowSpacing: 2 Repeater { diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml index 7bedb9e12..23bc3eba4 100644 --- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml +++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml @@ -1572,7 +1572,7 @@ Item { Component { id: rowLayout Row { - spacing: 4 + spacing: Theme.spacingXS visible: loadedIcons.length > 0 || SettingsData.showWorkspaceIndex || SettingsData.showWorkspaceName || loadedHasIcon Item { @@ -1759,7 +1759,7 @@ Item { Component { id: columnLayout Column { - spacing: 4 + spacing: Theme.spacingXS visible: loadedIcons.length > 0 || SettingsData.showWorkspaceIndex || SettingsData.showWorkspaceName || loadedHasIcon DankIcon { diff --git a/quickshell/Modules/DankDash/MediaPlayerTab.qml b/quickshell/Modules/DankDash/MediaPlayerTab.qml index 5633db162..2f857701d 100644 --- a/quickshell/Modules/DankDash/MediaPlayerTab.qml +++ b/quickshell/Modules/DankDash/MediaPlayerTab.qml @@ -455,7 +455,7 @@ Item { Column { width: parent.width - spacing: 2 + spacing: Theme.spacingXXS anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: parent.height * 0.2 diff --git a/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml b/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml index b9241d3eb..bb332401c 100644 --- a/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml +++ b/quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml @@ -582,7 +582,7 @@ Rectangle { anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter anchors.bottomMargin: 3 - spacing: 2 + spacing: Theme.spacingXXS visible: CalendarService && CalendarService.calendarAvailable && CalendarService.hasEventsForDate(dayDate) Repeater { @@ -965,7 +965,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 60 : (Theme.spacingS + 6) anchors.rightMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 64 : Theme.spacingXS - spacing: 2 + spacing: Theme.spacingXXS visible: !taskItem.isEditing StyledText { diff --git a/quickshell/Modules/DankDash/WeatherForecastCard.qml b/quickshell/Modules/DankDash/WeatherForecastCard.qml index 2cb8ad746..c09ae4462 100644 --- a/quickshell/Modules/DankDash/WeatherForecastCard.qml +++ b/quickshell/Modules/DankDash/WeatherForecastCard.qml @@ -154,7 +154,7 @@ Rectangle { Column { id: detailsColumn - spacing: 2 + spacing: Theme.spacingXXS visible: !root.dense width: implicitWidth @@ -183,7 +183,7 @@ Rectangle { Repeater { model: root.values.length Row { - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: root.values[index].icon diff --git a/quickshell/Modules/DankDash/WeatherTab.qml b/quickshell/Modules/DankDash/WeatherTab.qml index 28fe270a8..12fd17809 100644 --- a/quickshell/Modules/DankDash/WeatherTab.qml +++ b/quickshell/Modules/DankDash/WeatherTab.qml @@ -349,7 +349,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.label diff --git a/quickshell/Modules/Dock/DockAppButton.qml b/quickshell/Modules/Dock/DockAppButton.qml index e28696fdc..c74a84bda 100644 --- a/quickshell/Modules/Dock/DockAppButton.qml +++ b/quickshell/Modules/Dock/DockAppButton.qml @@ -556,7 +556,7 @@ Item { id: rowIndicator Row { - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: { @@ -614,7 +614,7 @@ Item { id: columnIndicator Column { - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: { diff --git a/quickshell/Modules/Greetd/GreeterContent.qml b/quickshell/Modules/Greetd/GreeterContent.qml index 6dd1b0ffa..f992291f4 100644 --- a/quickshell/Modules/Greetd/GreeterContent.qml +++ b/quickshell/Modules/Greetd/GreeterContent.qml @@ -1448,7 +1448,7 @@ Item { Row { id: keyboardLayoutRow - spacing: 4 + spacing: Theme.spacingXS Item { width: Theme.iconSize @@ -1518,7 +1518,7 @@ Item { } Row { - spacing: 6 + spacing: Theme.spacingXS visible: GreetdSettings.weatherEnabled && WeatherService.weather.available anchors.verticalCenter: parent.verticalCenter @@ -1597,7 +1597,7 @@ Item { } Row { - spacing: 4 + spacing: Theme.spacingXS visible: BatteryService.batteryAvailable anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/Lock/LockScreenContent.qml b/quickshell/Modules/Lock/LockScreenContent.qml index f050ae24c..03800fa56 100644 --- a/quickshell/Modules/Lock/LockScreenContent.qml +++ b/quickshell/Modules/Lock/LockScreenContent.qml @@ -667,7 +667,7 @@ Item { anchors.right: parent.right anchors.top: parent.top anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Row { width: parent.width @@ -1246,7 +1246,7 @@ Item { anchors.top: passwordLayout.bottom anchors.topMargin: Theme.spacingS anchors.horizontalCenter: passwordLayout.horizontalCenter - spacing: 4 + spacing: Theme.spacingXS opacity: DMSService.capsLockState ? 1 : 0 DankIcon { @@ -1304,7 +1304,7 @@ Item { Row { id: keyboardLayoutRow - spacing: 4 + spacing: Theme.spacingXS Item { width: Theme.iconSize @@ -1546,7 +1546,7 @@ Item { } Row { - spacing: 6 + spacing: Theme.spacingXS visible: WeatherService.weather.available anchors.verticalCenter: parent.verticalCenter @@ -1664,7 +1664,7 @@ Item { } Row { - spacing: 4 + spacing: Theme.spacingXS visible: BatteryService.batteryAvailable anchors.verticalCenter: parent.verticalCenter diff --git a/quickshell/Modules/Notepad/NotepadSettings.qml b/quickshell/Modules/Notepad/NotepadSettings.qml index e664c6d10..c9e5ef4b4 100644 --- a/quickshell/Modules/Notepad/NotepadSettings.qml +++ b/quickshell/Modules/Notepad/NotepadSettings.qml @@ -537,7 +537,7 @@ Item { width: parent.width - Theme.spacingL * 2 anchors.top: shortcutsHeader.bottom anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width diff --git a/quickshell/Modules/Notifications/Center/NotificationKeyboardHints.qml b/quickshell/Modules/Notifications/Center/NotificationKeyboardHints.qml index f734f5a27..445b99fe6 100644 --- a/quickshell/Modules/Notifications/Center/NotificationKeyboardHints.qml +++ b/quickshell/Modules/Notifications/Center/NotificationKeyboardHints.qml @@ -20,7 +20,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("↑/↓: Nav • Space: Expand • Enter: Action/Expand • E: Text") diff --git a/quickshell/Modules/Notifications/Center/NotificationSettings.qml b/quickshell/Modules/Notifications/Center/NotificationSettings.qml index 0452027f6..23ada2846 100644 --- a/quickshell/Modules/Notifications/Center/NotificationSettings.qml +++ b/quickshell/Modules/Notifications/Center/NotificationSettings.qml @@ -248,7 +248,7 @@ Rectangle { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: overlayRow.width - Theme.iconSizeSmall - Theme.spacingM @@ -299,7 +299,7 @@ Rectangle { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: privacyRow.width - Theme.iconSizeSmall - Theme.spacingM diff --git a/quickshell/Modules/OSD/MediaPlaybackOSD.qml b/quickshell/Modules/OSD/MediaPlaybackOSD.qml index 35ef5dfae..5d92388f7 100644 --- a/quickshell/Modules/OSD/MediaPlaybackOSD.qml +++ b/quickshell/Modules/OSD/MediaPlaybackOSD.qml @@ -261,7 +261,7 @@ DankOSD { x: parent.gap * 2 + Theme.iconSize width: parent.width - Theme.iconSize - parent.gap * 3 anchors.verticalCenter: parent.verticalCenter - spacing: 3 + spacing: Theme.spacingXXS StyledText { id: topText diff --git a/quickshell/Modules/ProcessList/DisksView.qml b/quickshell/Modules/ProcessList/DisksView.qml index 82506f614..fb8b04f07 100644 --- a/quickshell/Modules/ProcessList/DisksView.qml +++ b/quickshell/Modules/ProcessList/DisksView.qml @@ -148,7 +148,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true clip: true - spacing: 4 + spacing: Theme.spacingXS model: DgopService.diskMounts diff --git a/quickshell/Modules/ProcessList/ProcessesView.qml b/quickshell/Modules/ProcessList/ProcessesView.qml index d3582c0bd..e6bee87b7 100644 --- a/quickshell/Modules/ProcessList/ProcessesView.qml +++ b/quickshell/Modules/ProcessList/ProcessesView.qml @@ -299,7 +299,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true clip: true - spacing: 2 + spacing: Theme.spacingXXS states: [ State { @@ -410,7 +410,7 @@ Item { anchors.fill: parent anchors.leftMargin: Theme.spacingS anchors.rightMargin: Theme.spacingS - spacing: 4 + spacing: Theme.spacingXS Item { Layout.fillWidth: headerItem.alignment === Text.AlignLeft diff --git a/quickshell/Modules/ProcessList/SystemView.qml b/quickshell/Modules/ProcessList/SystemView.qml index 1ddd4b086..450c311a1 100644 --- a/quickshell/Modules/ProcessList/SystemView.qml +++ b/quickshell/Modules/ProcessList/SystemView.qml @@ -134,7 +134,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true clip: true - spacing: 8 + spacing: Theme.spacingS model: DgopService.availableGpus diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index 7a8ae8e10..f9d58be96 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -642,7 +642,7 @@ Item { spacing: Theme.spacingL Column { - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Version") @@ -667,7 +667,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("API") @@ -692,7 +692,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Status") @@ -702,7 +702,7 @@ Item { } Row { - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 8 @@ -738,7 +738,7 @@ Item { Flow { width: parent.width - spacing: 6 + spacing: Theme.spacingS Repeater { model: DMSService.capabilities diff --git a/quickshell/Modules/Settings/AudioTab.qml b/quickshell/Modules/Settings/AudioTab.qml index b8721098c..86f29528f 100644 --- a/quickshell/Modules/Settings/AudioTab.qml +++ b/quickshell/Modules/Settings/AudioTab.qml @@ -575,7 +575,7 @@ Item { Column { width: parent.width - Theme.iconSize - Theme.spacingM - 8 - spacing: 4 + spacing: Theme.spacingXS StyledText { text: I18n.tr("Set Custom Device Name", "Audio device rename dialog title") diff --git a/quickshell/Modules/Settings/AutoStartTab.qml b/quickshell/Modules/Settings/AutoStartTab.qml index ba8856f79..5d555ee40 100644 --- a/quickshell/Modules/Settings/AutoStartTab.qml +++ b/quickshell/Modules/Settings/AutoStartTab.qml @@ -701,7 +701,7 @@ Item { Column { width: parent.width - 20 - Theme.spacingM - 24 - Theme.spacingM - Theme.spacingM - 60 - Theme.spacingM - 32 - Theme.spacingS anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { width: parent.width diff --git a/quickshell/Modules/Settings/DankDashTab.qml b/quickshell/Modules/Settings/DankDashTab.qml index 37dfa13b5..cb97da8df 100644 --- a/quickshell/Modules/Settings/DankDashTab.qml +++ b/quickshell/Modules/Settings/DankDashTab.qml @@ -502,7 +502,7 @@ Item { anchors.right: visibilityButton.left anchors.rightMargin: Theme.spacingM anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: rowItem.present.text diff --git a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml index 619c30371..35b331295 100644 --- a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml +++ b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml @@ -350,7 +350,7 @@ FloatingWindow { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 44 - Theme.iconSize - Theme.spacingM * 3 Row { @@ -376,7 +376,7 @@ FloatingWindow { Row { id: featuredWidgetRow anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: "star" diff --git a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml index 3690d90d3..7e6bda8fd 100644 --- a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml +++ b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml @@ -91,7 +91,7 @@ SettingsCard { } contentItem: Column { - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width diff --git a/quickshell/Modules/Settings/DesktopWidgetsTab.qml b/quickshell/Modules/Settings/DesktopWidgetsTab.qml index 8d0b8c411..31f982108 100644 --- a/quickshell/Modules/Settings/DesktopWidgetsTab.qml +++ b/quickshell/Modules/Settings/DesktopWidgetsTab.qml @@ -453,7 +453,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: parent.width - 40 - Theme.spacingM @@ -495,7 +495,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: parent.width - 40 - Theme.spacingM @@ -537,7 +537,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: parent.width - 40 - Theme.spacingM diff --git a/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml b/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml index 0209e5f17..f9c2a7308 100644 --- a/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml +++ b/quickshell/Modules/Settings/DisplayConfig/MonitorRect.qml @@ -69,7 +69,7 @@ Rectangle { Column { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: root.isConnected ? "desktop_windows" : "desktop_access_disabled" diff --git a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml index 0a894baa5..b4208e49c 100644 --- a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml +++ b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml @@ -51,7 +51,7 @@ StyledRect { Column { width: parent.width - Theme.iconSize - Theme.spacingM - (disconnectedBadge.visible ? disconnectedBadge.width + deleteButton.width + Theme.spacingS * 2 : disabledBadge.visible ? disabledBadge.width + Theme.spacingS : 0) - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: DisplayConfigState.getOutputDisplayName(root.outputData, root.outputName) diff --git a/quickshell/Modules/Settings/DisplayConfigTab.qml b/quickshell/Modules/Settings/DisplayConfigTab.qml index 438b142b5..b6ac1380a 100644 --- a/quickshell/Modules/Settings/DisplayConfigTab.qml +++ b/quickshell/Modules/Settings/DisplayConfigTab.qml @@ -378,7 +378,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: { diff --git a/quickshell/Modules/Settings/GammaControlTab.qml b/quickshell/Modules/Settings/GammaControlTab.qml index 7061515c0..c6b2f6bc8 100644 --- a/quickshell/Modules/Settings/GammaControlTab.qml +++ b/quickshell/Modules/Settings/GammaControlTab.qml @@ -636,7 +636,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter StyledText { diff --git a/quickshell/Modules/Settings/LauncherTab.qml b/quickshell/Modules/Settings/LauncherTab.qml index 982290b8d..e1d50218e 100644 --- a/quickshell/Modules/Settings/LauncherTab.qml +++ b/quickshell/Modules/Settings/LauncherTab.qml @@ -127,7 +127,7 @@ Item { Column { width: Math.max(0, parent.width - Theme.iconSize - defaultShortcutValue.width - Theme.spacingM * 2) anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Default Launcher Shortcut") @@ -221,7 +221,7 @@ Item { Column { width: Math.max(0, parent.width - Theme.iconSize - spotlightShortcutValue.width - Theme.spacingM * 2) anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Spotlight Bar Shortcut") @@ -806,7 +806,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: pluginDelegate.plugin?.name ?? pluginDelegate.modelData @@ -989,7 +989,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS Row { spacing: Theme.spacingS @@ -1244,7 +1244,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name @@ -1355,7 +1355,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name @@ -1501,7 +1501,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name || I18n.tr("Unknown App") diff --git a/quickshell/Modules/Settings/NetworkEthernetTab.qml b/quickshell/Modules/Settings/NetworkEthernetTab.qml index 452e547c8..bae2b7e0d 100644 --- a/quickshell/Modules/Settings/NetworkEthernetTab.qml +++ b/quickshell/Modules/Settings/NetworkEthernetTab.qml @@ -76,7 +76,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS visible: NetworkService.ethernetDevices.length > 0 StyledText { @@ -139,7 +139,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 20 - Theme.spacingS StyledText { @@ -422,7 +422,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.id || I18n.tr("Unknown") diff --git a/quickshell/Modules/Settings/NetworkVpnTab.qml b/quickshell/Modules/Settings/NetworkVpnTab.qml index 8f52f9cfb..24115bf98 100644 --- a/quickshell/Modules/Settings/NetworkVpnTab.qml +++ b/quickshell/Modules/Settings/NetworkVpnTab.qml @@ -229,7 +229,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS visible: DMSNetworkService.vpnAvailable && DMSNetworkService.profiles.length > 0 Repeater { @@ -290,7 +290,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter width: parent.width - 20 - ((canExpand ? 28 : 0) + (canDelete ? 28 : 0)) - Theme.spacingS * 4 diff --git a/quickshell/Modules/Settings/NetworkWifiTab.qml b/quickshell/Modules/Settings/NetworkWifiTab.qml index bc91a3e89..aca22de43 100644 --- a/quickshell/Modules/Settings/NetworkWifiTab.qml +++ b/quickshell/Modules/Settings/NetworkWifiTab.qml @@ -430,7 +430,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS visible: (NetworkService.wifiNetworks?.length ?? 0) > 0 Repeater { @@ -526,7 +526,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 20 - Theme.spacingS Row { @@ -859,7 +859,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS Repeater { model: savedWifiCard.expanded ? savedWifiCard.savedNetworks : [] @@ -935,7 +935,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 20 - Theme.spacingS Row { diff --git a/quickshell/Modules/Settings/NotificationsTab.qml b/quickshell/Modules/Settings/NotificationsTab.qml index e98fe4dab..98f3f5434 100644 --- a/quickshell/Modules/Settings/NotificationsTab.qml +++ b/quickshell/Modules/Settings/NotificationsTab.qml @@ -561,7 +561,7 @@ Item { Column { width: parent.width - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Pattern") @@ -584,7 +584,7 @@ Item { Column { width: (parent.width - Theme.spacingS * 3) / 4 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Field") @@ -605,7 +605,7 @@ Item { Column { width: (parent.width - Theme.spacingS * 3) / 4 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Type") @@ -625,7 +625,7 @@ Item { Column { width: (parent.width - Theme.spacingS * 3) / 4 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Action") @@ -646,7 +646,7 @@ Item { Column { width: (parent.width - Theme.spacingS * 3) / 4 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Priority") diff --git a/quickshell/Modules/Settings/PluginBrowser.qml b/quickshell/Modules/Settings/PluginBrowser.qml index 1aa6976ac..93ac3a065 100644 --- a/quickshell/Modules/Settings/PluginBrowser.qml +++ b/quickshell/Modules/Settings/PluginBrowser.qml @@ -930,7 +930,7 @@ FloatingWindow { Column { width: parent.width - Theme.iconSize - Theme.spacingM - installButton.width - Theme.spacingM - spacing: 2 + spacing: Theme.spacingXXS Row { spacing: Theme.spacingXS @@ -957,7 +957,7 @@ FloatingWindow { Row { id: featuredRow anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: "star" @@ -1053,7 +1053,7 @@ FloatingWindow { Row { id: upvoteRow anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS DankIcon { name: "thumb_up" diff --git a/quickshell/Modules/Settings/PluginListItem.qml b/quickshell/Modules/Settings/PluginListItem.qml index 83f51766b..5d584cc12 100644 --- a/quickshell/Modules/Settings/PluginListItem.qml +++ b/quickshell/Modules/Settings/PluginListItem.qml @@ -114,7 +114,7 @@ StyledRect { Row { anchors.centerIn: parent - spacing: 2 + spacing: Theme.spacingXXS DankIcon { id: incompatIcon diff --git a/quickshell/Modules/Settings/PrinterTab.qml b/quickshell/Modules/Settings/PrinterTab.qml index ee7e392ef..ad337d4b4 100644 --- a/quickshell/Modules/Settings/PrinterTab.qml +++ b/quickshell/Modules/Settings/PrinterTab.qml @@ -930,7 +930,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS visible: CupsService.printerNames.length > 0 Repeater { @@ -987,7 +987,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 20 - Theme.spacingS StyledText { @@ -1453,7 +1453,7 @@ Item { anchors.right: parent.right anchors.rightMargin: Theme.spacingS anchors.verticalCenter: parent.verticalCenter - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 24 @@ -1601,7 +1601,7 @@ Item { Column { width: parent.width - spacing: 4 + spacing: Theme.spacingXS Repeater { model: CupsService.printerClasses @@ -1632,7 +1632,7 @@ Item { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.name || I18n.tr("Unknown") diff --git a/quickshell/Modules/Settings/RunningAppsTab.qml b/quickshell/Modules/Settings/RunningAppsTab.qml index f3b47f8b6..08d6245bd 100644 --- a/quickshell/Modules/Settings/RunningAppsTab.qml +++ b/quickshell/Modules/Settings/RunningAppsTab.qml @@ -81,7 +81,7 @@ Item { Column { width: (parent.width - deleteBtn.width - Theme.spacingS) / 2 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Pattern") @@ -100,7 +100,7 @@ Item { Column { width: (parent.width - deleteBtn.width - Theme.spacingS) / 2 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Replacement") @@ -148,7 +148,7 @@ Item { Column { width: 120 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Type") diff --git a/quickshell/Modules/Settings/ThemeBrowser.qml b/quickshell/Modules/Settings/ThemeBrowser.qml index 11c2c05e4..db6a37fdd 100644 --- a/quickshell/Modules/Settings/ThemeBrowser.qml +++ b/quickshell/Modules/Settings/ThemeBrowser.qml @@ -425,7 +425,7 @@ FloatingWindow { Column { width: parent.width - (hasPreview ? 180 : 48) - Theme.spacingM - installButton.width - Theme.spacingM - spacing: 6 + spacing: Theme.spacingXS anchors.verticalCenter: parent.verticalCenter Row { diff --git a/quickshell/Modules/Settings/ThemeColorsTab.qml b/quickshell/Modules/Settings/ThemeColorsTab.qml index 44d3785cc..9e1afd4bc 100644 --- a/quickshell/Modules/Settings/ThemeColorsTab.qml +++ b/quickshell/Modules/Settings/ThemeColorsTab.qml @@ -1415,7 +1415,7 @@ Item { width: parent.width - Theme.spacingM * 2 Column { - spacing: 2 + spacing: Theme.spacingXXS width: (parent.width - Theme.spacingL * 2) / 3 anchors.verticalCenter: parent.verticalCenter @@ -1450,7 +1450,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS width: (parent.width - Theme.spacingL * 2) / 3 anchors.verticalCenter: parent.verticalCenter @@ -1485,7 +1485,7 @@ Item { } Column { - spacing: 2 + spacing: Theme.spacingXXS width: (parent.width - Theme.spacingL * 2) / 3 anchors.verticalCenter: parent.verticalCenter visible: SessionData.themeModeAutoEnabled && SessionData.themeModeNextTransition diff --git a/quickshell/Modules/Settings/TimeWeatherTab.qml b/quickshell/Modules/Settings/TimeWeatherTab.qml index 97d808e4e..5db4f6772 100644 --- a/quickshell/Modules/Settings/TimeWeatherTab.qml +++ b/quickshell/Modules/Settings/TimeWeatherTab.qml @@ -350,7 +350,7 @@ Item { Column { width: (parent.width - Theme.spacingL) / 2 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("• d - Day (1-31)") @@ -381,7 +381,7 @@ Item { Column { width: (parent.width - Theme.spacingL) / 2 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("• MM - Month (01-12)") @@ -913,7 +913,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Feels Like") font.pixelSize: Theme.fontSizeSmall @@ -957,7 +957,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Humidity") font.pixelSize: Theme.fontSizeSmall @@ -1001,7 +1001,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Wind") font.pixelSize: Theme.fontSizeSmall @@ -1058,7 +1058,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Pressure") font.pixelSize: Theme.fontSizeSmall @@ -1108,7 +1108,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Rain Chance") font.pixelSize: Theme.fontSizeSmall @@ -1152,7 +1152,7 @@ Item { Column { anchors.horizontalCenter: parent.horizontalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: I18n.tr("Visibility") font.pixelSize: Theme.fontSizeSmall diff --git a/quickshell/Modules/Settings/UsersTab.qml b/quickshell/Modules/Settings/UsersTab.qml index af1d38c96..9863f52fa 100644 --- a/quickshell/Modules/Settings/UsersTab.qml +++ b/quickshell/Modules/Settings/UsersTab.qml @@ -182,7 +182,7 @@ Item { Column { width: parent.width - Theme.iconSize - actionButtons.width - Theme.spacingM * 3 - spacing: 2 + spacing: Theme.spacingXXS anchors.verticalCenter: parent.verticalCenter Row { diff --git a/quickshell/Modules/Settings/WallpaperTab.qml b/quickshell/Modules/Settings/WallpaperTab.qml index 89930b6e3..2b7d083b1 100644 --- a/quickshell/Modules/Settings/WallpaperTab.qml +++ b/quickshell/Modules/Settings/WallpaperTab.qml @@ -135,7 +135,7 @@ Item { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 32 @@ -562,7 +562,7 @@ Item { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 28 @@ -752,7 +752,7 @@ Item { Row { anchors.centerIn: parent - spacing: 4 + spacing: Theme.spacingXS Rectangle { width: 28 diff --git a/quickshell/Modules/Settings/WidgetSelectionPopup.qml b/quickshell/Modules/Settings/WidgetSelectionPopup.qml index 54530a85e..6dfc3fdc3 100644 --- a/quickshell/Modules/Settings/WidgetSelectionPopup.qml +++ b/quickshell/Modules/Settings/WidgetSelectionPopup.qml @@ -357,7 +357,7 @@ FloatingWindow { Column { id: textColumn anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - Theme.iconSize * 2 - Theme.spacingM * 4 + 4 StyledText { diff --git a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml index ed52c0bbc..188a71b4b 100644 --- a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml +++ b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml @@ -202,7 +202,7 @@ FloatingWindow { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS width: parent.width - 28 - Theme.spacingM * 3 - 24 StyledText { @@ -283,26 +283,31 @@ FloatingWindow { } function selectNext() { - if (filteredApps.length === 0) return; + if (filteredApps.length === 0) + return; keyboardNavigationActive = true; selectedIndex = Math.min(selectedIndex + 1, filteredApps.length - 1); } function selectPrevious() { - if (filteredApps.length === 0) return; + if (filteredApps.length === 0) + return; keyboardNavigationActive = true; selectedIndex = Math.max(selectedIndex - 1, -1); - if (selectedIndex === -1) keyboardNavigationActive = false; + if (selectedIndex === -1) + keyboardNavigationActive = false; } function selectApp() { - if (selectedIndex < 0 || selectedIndex >= filteredApps.length) return; + if (selectedIndex < 0 || selectedIndex >= filteredApps.length) + return; selectAppByIndex(selectedIndex); } function selectAppByIndex(idx) { const app = filteredApps[idx]; - if (!app) return; + if (!app) + return; root.appSelected(app.id || app.execString || ""); hide(); } diff --git a/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml b/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml index 77a28f192..37c5618bf 100644 --- a/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml +++ b/quickshell/Modules/Settings/Widgets/DeviceAliasRow.qml @@ -48,7 +48,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter width: parent.width - Theme.iconSize - Theme.spacingM * 3 - buttonsRow.width - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: root.displayedName @@ -62,7 +62,7 @@ Rectangle { Column { width: parent.width - spacing: 2 + spacing: Theme.spacingXXS Row { width: parent.width diff --git a/quickshell/Modules/Settings/Widgets/SettingsControlledByFrame.qml b/quickshell/Modules/Settings/Widgets/SettingsControlledByFrame.qml index fe09f90cf..f31155526 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsControlledByFrame.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsControlledByFrame.qml @@ -40,7 +40,7 @@ StyledRect { Column { anchors.verticalCenter: parent.verticalCenter width: parent.width - Theme.iconSize - openButton.width - Theme.spacingM * 2 - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: root.settingLabel diff --git a/quickshell/Modules/Settings/WidgetsTabSection.qml b/quickshell/Modules/Settings/WidgetsTabSection.qml index ecc94a7e3..b499ca8c7 100644 --- a/quickshell/Modules/Settings/WidgetsTabSection.qml +++ b/quickshell/Modules/Settings/WidgetsTabSection.qml @@ -364,7 +364,7 @@ Column { anchors.right: actionButtons.left anchors.rightMargin: Theme.spacingM anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.text @@ -1279,7 +1279,7 @@ Column { Column { anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -1417,7 +1417,7 @@ Column { id: contentColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -1616,7 +1616,7 @@ Column { anchors.right: parent.right anchors.rightMargin: Theme.spacingXS anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS DankActionButton { buttonSize: 28 @@ -1681,7 +1681,7 @@ Column { id: kbdLayoutCtxMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -1766,7 +1766,7 @@ Column { id: focusedWindowMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -1935,7 +1935,7 @@ Column { id: diskMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -2315,7 +2315,7 @@ Column { id: menuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Item { id: controlCenterContentMetrics @@ -2615,7 +2615,7 @@ Column { id: menuPrivacyColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -2840,7 +2840,7 @@ Column { id: gpuMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: DgopService.availableGpus || [] @@ -2876,7 +2876,7 @@ Column { Column { anchors.verticalCenter: parent.verticalCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: modelData.driver ? modelData.driver.toUpperCase() : "" @@ -2949,7 +2949,7 @@ Column { id: batteryMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width @@ -3198,7 +3198,7 @@ Column { id: musicMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Repeater { model: [ @@ -3315,7 +3315,7 @@ Column { id: runningAppsMenuColumn anchors.fill: parent anchors.margins: Theme.spacingS - spacing: 2 + spacing: Theme.spacingXXS Rectangle { width: parent.width diff --git a/quickshell/Modules/Settings/WindowRulesTab.qml b/quickshell/Modules/Settings/WindowRulesTab.qml index 67b99bd43..7cc3829b3 100644 --- a/quickshell/Modules/Settings/WindowRulesTab.qml +++ b/quickshell/Modules/Settings/WindowRulesTab.qml @@ -646,7 +646,7 @@ Item { ColumnLayout { Layout.fillWidth: true - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: ruleDelegateItem.displayName @@ -715,7 +715,7 @@ Item { RowLayout { Layout.alignment: Qt.AlignVCenter - spacing: 2 + spacing: Theme.spacingXXS DankActionButton { buttonSize: 28 @@ -899,7 +899,7 @@ Item { ColumnLayout { Layout.fillWidth: true - spacing: 2 + spacing: Theme.spacingXXS RowLayout { Layout.fillWidth: true diff --git a/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml b/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml index e5b077f9e..695acd6a4 100644 --- a/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml +++ b/quickshell/PLUGINS/ExampleWithVariants/VariantWidget.qml @@ -15,7 +15,7 @@ PluginComponent { horizontalBarPill: Component { Row { - spacing: 3 + spacing: Theme.spacingXS DankIcon { name: root.displayIcon diff --git a/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml b/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml index e30aaa811..f22c8d404 100644 --- a/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml +++ b/quickshell/PLUGINS/LauncherExample/LauncherExampleSettings.qml @@ -1,5 +1,6 @@ import QtQuick import QtQuick.Controls +import qs.Common import qs.Widgets FocusScope { @@ -14,7 +15,7 @@ FocusScope { id: settingsColumn anchors.fill: parent anchors.margins: 16 - spacing: 16 + spacing: Theme.spacingL Text { text: "Launcher Example Plugin Settings" @@ -38,7 +39,7 @@ FocusScope { } Column { - spacing: 12 + spacing: Theme.spacingM width: parent.width - 32 Text { @@ -57,7 +58,7 @@ FocusScope { } Row { - spacing: 12 + spacing: Theme.spacingM CheckBox { id: noTriggerToggle @@ -91,18 +92,18 @@ FocusScope { } onCheckedChanged: { - saveSettings("noTrigger", checked) + saveSettings("noTrigger", checked); if (checked) { - saveSettings("trigger", "") + saveSettings("trigger", ""); } else { - saveSettings("trigger", triggerField.text || "#") + saveSettings("trigger", triggerField.text || "#"); } } } } Row { - spacing: 12 + spacing: Theme.spacingM anchors.left: parent.left anchors.right: parent.right visible: !noTriggerToggle.checked @@ -124,9 +125,9 @@ FocusScope { textColor: "#FFFFFF" onTextEdited: { - const newTrigger = text.trim() - saveSettings("trigger", newTrigger || "#") - saveSettings("noTrigger", newTrigger === "") + const newTrigger = text.trim(); + saveSettings("trigger", newTrigger || "#"); + saveSettings("noTrigger", newTrigger === ""); } } @@ -146,7 +147,7 @@ FocusScope { } Column { - spacing: 8 + spacing: Theme.spacingS width: parent.width - 32 Text { @@ -157,7 +158,7 @@ FocusScope { } Column { - spacing: 4 + spacing: Theme.spacingXS leftPadding: 16 Text { @@ -187,7 +188,7 @@ FocusScope { } Column { - spacing: 8 + spacing: Theme.spacingS width: parent.width - 32 Text { @@ -198,7 +199,7 @@ FocusScope { } Column { - spacing: 4 + spacing: Theme.spacingXS leftPadding: 16 bottomPadding: 24 @@ -231,14 +232,14 @@ FocusScope { function saveSettings(key, value) { if (pluginService) { - pluginService.savePluginData("launcherExample", key, value) + pluginService.savePluginData("launcherExample", key, value); } } function loadSettings(key, defaultValue) { if (pluginService) { - return pluginService.loadPluginData("launcherExample", key, defaultValue) + return pluginService.loadPluginData("launcherExample", key, defaultValue); } - return defaultValue + return defaultValue; } } diff --git a/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml b/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml index 96596146b..98962d002 100644 --- a/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml +++ b/quickshell/PLUGINS/QuickNotesExample/QuickNotesSettings.qml @@ -1,4 +1,5 @@ import QtQuick +import qs.Common import qs.Widgets FocusScope { @@ -13,7 +14,7 @@ FocusScope { id: settingsColumn anchors.fill: parent anchors.margins: 16 - spacing: 16 + spacing: Theme.spacingL Text { text: "Quick Notes Settings" @@ -37,7 +38,7 @@ FocusScope { } Column { - spacing: 12 + spacing: Theme.spacingM width: parent.width - 32 Text { @@ -48,7 +49,7 @@ FocusScope { } Row { - spacing: 12 + spacing: Theme.spacingM anchors.left: parent.left anchors.right: parent.right @@ -82,7 +83,7 @@ FocusScope { } Column { - spacing: 12 + spacing: Theme.spacingM width: parent.width - 32 Text { @@ -93,7 +94,7 @@ FocusScope { } Row { - spacing: 12 + spacing: Theme.spacingM Text { text: "Max notes:" @@ -137,7 +138,7 @@ FocusScope { Row { id: clearRow anchors.centerIn: parent - spacing: 8 + spacing: Theme.spacingS Text { text: "🗑" @@ -174,7 +175,7 @@ FocusScope { } Column { - spacing: 8 + spacing: Theme.spacingS width: parent.width - 32 Text { @@ -185,7 +186,7 @@ FocusScope { } Column { - spacing: 4 + spacing: Theme.spacingXS leftPadding: 16 bottomPadding: 24 diff --git a/quickshell/Widgets/DankDropdown.qml b/quickshell/Widgets/DankDropdown.qml index adf63cacd..db6f30174 100644 --- a/quickshell/Widgets/DankDropdown.qml +++ b/quickshell/Widgets/DankDropdown.qml @@ -458,7 +458,7 @@ Item { model: ScriptModel { values: dropdownMenu.filteredOptions } - spacing: 2 + spacing: Theme.spacingXXS interactive: true flickDeceleration: 1500 diff --git a/quickshell/Widgets/DankIconPicker.qml b/quickshell/Widgets/DankIconPicker.qml index 946bc5848..44093df0f 100644 --- a/quickshell/Widgets/DankIconPicker.qml +++ b/quickshell/Widgets/DankIconPicker.qml @@ -203,7 +203,7 @@ Rectangle { Flow { width: parent.width - spacing: 4 + spacing: Theme.spacingXS Repeater { model: modelData.icons diff --git a/quickshell/Widgets/DankLocationSearch.qml b/quickshell/Widgets/DankLocationSearch.qml index d8bc1af3c..73d0a77c2 100644 --- a/quickshell/Widgets/DankLocationSearch.qml +++ b/quickshell/Widgets/DankLocationSearch.qml @@ -204,7 +204,7 @@ Item { anchors.fill: parent clip: true model: searchResultsModel - spacing: 2 + spacing: Theme.spacingXXS delegate: StyledRect { width: searchResultsList.width diff --git a/quickshell/Widgets/DankNumberStepper.qml b/quickshell/Widgets/DankNumberStepper.qml index 02268ea86..cecdbef11 100644 --- a/quickshell/Widgets/DankNumberStepper.qml +++ b/quickshell/Widgets/DankNumberStepper.qml @@ -27,7 +27,7 @@ Column { readonly property bool effectiveDecrementEnabled: root.onDecrement ? root.decrementEnabled : false width: Math.max(buttonSize * 2, root.implicitWidth + horizontalPadding * 2) - spacing: 4 + spacing: Theme.spacingXS DankActionButton { anchors.horizontalCenter: parent.horizontalCenter diff --git a/quickshell/Widgets/KeybindItem.qml b/quickshell/Widgets/KeybindItem.qml index 8e32383ea..72194bf32 100644 --- a/quickshell/Widgets/KeybindItem.qml +++ b/quickshell/Widgets/KeybindItem.qml @@ -370,7 +370,7 @@ Item { ColumnLayout { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter - spacing: 2 + spacing: Theme.spacingXXS StyledText { text: root.isExpanded ? (root._selectedDesc || root.bindData.action || I18n.tr("No action")) : (root.bindData.desc || root.bindData.action || I18n.tr("No action")) diff --git a/quickshell/Widgets/VpnDetailContent.qml b/quickshell/Widgets/VpnDetailContent.qml index d480b833d..1faa0f964 100644 --- a/quickshell/Widgets/VpnDetailContent.qml +++ b/quickshell/Widgets/VpnDetailContent.qml @@ -194,7 +194,7 @@ Rectangle { id: vpnListView anchors.fill: parent visible: DMSNetworkService.profiles.length > 0 - spacing: 4 + spacing: Theme.spacingXS cacheBuffer: 200 clip: true diff --git a/scripts/format-staged.py b/scripts/format-staged.py index b36cca816..83c00f0d3 100755 --- a/scripts/format-staged.py +++ b/scripts/format-staged.py @@ -13,13 +13,16 @@ would silently absorb those into the commit. import json import os +import queue import shutil import subprocess import sys +import threading from pathlib import Path TAB_SIZE = 4 +REQUEST_TIMEOUT = 30 QMLLS_CANDIDATES = ["qmlls6", "qmlls"] QMLLINT_CANDIDATES = ["/usr/lib/qt6/bin/qmllint", "qmllint6", "qmllint"] @@ -111,12 +114,19 @@ class LspClient: stderr=subprocess.DEVNULL, ) self._next_id = 1 + self._write_lock = threading.Lock() + self._responses = queue.Queue() + # Drain stdout continuously: qmlls floods publishDiagnostics (~100KB + # per file) and blocks once the 64KB pipe fills, deadlocking against + # our own blocking write of a large didOpen. + threading.Thread(target=self._pump, daemon=True).start() def _send(self, msg): body = json.dumps(msg).encode("utf-8") header = f"Content-Length: {len(body)}\r\n\r\n".encode("ascii") - self.proc.stdin.write(header + body) - self.proc.stdin.flush() + with self._write_lock: + self.proc.stdin.write(header + body) + self.proc.stdin.flush() def _read(self): headers = {} @@ -138,19 +148,39 @@ class LspClient: body += chunk return json.loads(body) + def _pump(self): + while True: + try: + msg = self._read() + except (RuntimeError, OSError, ValueError): + self._responses.put(None) + return + if "id" in msg and "method" in msg: + # Server-to-client request — reply with null so it doesn't stall. + try: + self._send({"jsonrpc": "2.0", "id": msg["id"], "result": None}) + except OSError: + pass + continue + if "id" in msg and ("result" in msg or "error" in msg): + self._responses.put(msg) + def request(self, method, params): req_id = self._next_id self._next_id += 1 self._send({"jsonrpc": "2.0", "id": req_id, "method": method, "params": params}) while True: - msg = self._read() - if msg.get("id") == req_id and ("result" in msg or "error" in msg): - if "error" in msg: - raise RuntimeError(f"LSP {method} error: {msg['error']}") - return msg.get("result") - if "id" in msg and "method" in msg: - # Server-to-client request — reply with null so it doesn't stall. - self._send({"jsonrpc": "2.0", "id": msg["id"], "result": None}) + try: + msg = self._responses.get(timeout=REQUEST_TIMEOUT) + except queue.Empty: + raise RuntimeError(f"LSP {method} timed out after {REQUEST_TIMEOUT}s") + if msg is None: + raise RuntimeError("qmlls closed unexpectedly") + if msg.get("id") != req_id: + continue + if "error" in msg: + raise RuntimeError(f"LSP {method} error: {msg['error']}") + return msg.get("result") def notify(self, method, params): self._send({"jsonrpc": "2.0", "method": method, "params": params}) @@ -272,6 +302,11 @@ def main(): print("skipped (qmlls crashed on this file; restarting it)") client = start_client(qmlls, root) continue + if "timed out" in str(exc): + print("skipped (qmlls timed out on this file; restarting it)") + client.proc.kill() + client = start_client(qmlls, root) + continue client.notify("textDocument/didClose", {"textDocument": {"uri": uri}}) if "invalid document" in str(exc).lower(): print("skipped (qmlls rejected as invalid)")