From a10ee7d3edab503fc0fae896b79f9ff89bf014d9 Mon Sep 17 00:00:00 2001 From: bbedward Date: Tue, 27 Oct 2026 09:39:03 -0400 Subject: [PATCH] search field: spacing adjustments port 2.0 (cherry picked from commit f56a088e4413adb43d7081fefdf57ffac064be92) --- dux-qml-common | 2 +- flake.lock | 6 +++--- quickshell/Modals/AppPickerModal.qml | 1 - .../Modals/DLauncherV2/Components/LauncherMetrics.qml | 2 +- quickshell/Modals/MuxModal.qml | 1 - quickshell/Modals/ProcessListModal.qml | 1 - .../Modules/ControlCenter/Components/CcWidgetSheet.qml | 1 - .../Modules/ControlCenter/Widgets/CcWidgetLibrary.qml | 1 - quickshell/Modules/Notepad/NotepadTextEditor.qml | 1 - .../Notifications/Center/HistoryNotificationList.qml | 1 + .../Center/KeyboardNavigatedNotificationList.qml | 1 + quickshell/Modules/Settings/RegistryBrowserWindow.qml | 1 - quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml | 1 - 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dux-qml-common b/dux-qml-common index 08efce90f..c6e4a6bce 160000 --- a/dux-qml-common +++ b/dux-qml-common @@ -1 +1 @@ -Subproject commit 08efce90fd4b2aa90c4064b57e48b14720bbe255 +Subproject commit c6e4a6bce24b804688225b0889410d2ec0ae06d7 diff --git a/flake.lock b/flake.lock index 9bb6462b3..880618c54 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1793073767, - "narHash": "sha256-mT0Kp4m/FP2u+I6GAZJtBH7LGHh6tSibDuRv4M4YBbc=", + "lastModified": 1793108324, + "narHash": "sha256-5EPljTgi7YWoBxmSbsDoSetzGPW28jcyPL5i5Yo1PAw=", "owner": "duxlabs-dev", "repo": "dux-qml-common", - "rev": "08efce90fd4b2aa90c4064b57e48b14720bbe255", + "rev": "c6e4a6bce24b804688225b0889410d2ec0ae06d7", "type": "github" }, "original": { diff --git a/quickshell/Modals/AppPickerModal.qml b/quickshell/Modals/AppPickerModal.qml index 78a3193c2..54bcf0f75 100644 --- a/quickshell/Modals/AppPickerModal.qml +++ b/quickshell/Modals/AppPickerModal.qml @@ -346,7 +346,6 @@ DModal { width: parent.width - Theme.spacingS * 2 anchors.horizontalCenter: parent.horizontalCenter - height: 52 font.pixelSize: Theme.fontSizeLarge enabled: root.shouldBeVisible ignoreLeftRightKeys: root.viewMode !== "list" diff --git a/quickshell/Modals/DLauncherV2/Components/LauncherMetrics.qml b/quickshell/Modals/DLauncherV2/Components/LauncherMetrics.qml index 4d8c472c9..8322d70d6 100644 --- a/quickshell/Modals/DLauncherV2/Components/LauncherMetrics.qml +++ b/quickshell/Modals/DLauncherV2/Components/LauncherMetrics.qml @@ -13,7 +13,7 @@ Singleton { readonly property real tileLabelHeight: Theme.spacingXL readonly property real tileLabelBlockHeight: tileLabelMetrics.lineSpacing * 2 readonly property real tileImageRatio: Theme.launcherImageRatio - readonly property real pillHeight: Theme.listItemHeight + readonly property real pillHeight: Theme.fieldHeightLarge readonly property real sectionHeight: Theme.buttonHeightXS readonly property real resultsGap: Theme.spacingXS readonly property real sectionBand: sectionHeight + resultsGap diff --git a/quickshell/Modals/MuxModal.qml b/quickshell/Modals/MuxModal.qml index a219c276b..0e75c11a9 100644 --- a/quickshell/Modals/MuxModal.qml +++ b/quickshell/Modals/MuxModal.qml @@ -308,7 +308,6 @@ DModal { id: searchField width: parent.width - height: 48 font.pixelSize: Theme.fontSizeMedium placeholderText: I18n.tr("Search sessions...") keyForwardTargets: [muxPanel] diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml index 6b52285f6..057a30cfc 100644 --- a/quickshell/Modals/ProcessListModal.qml +++ b/quickshell/Modals/ProcessListModal.qml @@ -257,7 +257,6 @@ DFloatingWindow { DSearchField { id: searchField Layout.fillWidth: true - Layout.preferredHeight: Theme.buttonHeightS placeholderText: I18n.tr("Search processes...", "process search placeholder") text: processListModal.searchText onTextChanged: processListModal.searchText = text diff --git a/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml b/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml index 8795b1b11..ed1514995 100644 --- a/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml +++ b/quickshell/Modules/ControlCenter/Components/CcWidgetSheet.qml @@ -258,7 +258,6 @@ DBottomSheet { DSearchField { id: searchField width: parent.width - height: Theme.fieldHeightLarge placeholderText: I18n.tr("Search widgets...") onAccepted: { if (root.matches.length > 0) diff --git a/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml b/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml index d9c492697..376396e34 100644 --- a/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml +++ b/quickshell/Modules/ControlCenter/Widgets/CcWidgetLibrary.qml @@ -65,7 +65,6 @@ Rectangle { anchors.topMargin: Theme.spacingM anchors.left: parent.left anchors.right: parent.right - height: Theme.fieldHeightLarge textColor: Theme.surfaceText font.pixelSize: Theme.fontSizeMedium placeholderText: I18n.tr("Search widgets...") diff --git a/quickshell/Modules/Notepad/NotepadTextEditor.qml b/quickshell/Modules/Notepad/NotepadTextEditor.qml index 7ee4ad57c..a1bef0264 100644 --- a/quickshell/Modules/Notepad/NotepadTextEditor.qml +++ b/quickshell/Modules/Notepad/NotepadTextEditor.qml @@ -394,7 +394,6 @@ Column { id: searchField Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter - Layout.preferredHeight: Theme.buttonHeightXS leftIconSize: Theme.iconSizeSmall font.pixelSize: Theme.fontSizeMedium placeholderText: I18n.tr("Find in note...") diff --git a/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml b/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml index d1df756f7..6a3845b3e 100644 --- a/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml +++ b/quickshell/Modules/Notifications/Center/HistoryNotificationList.qml @@ -246,6 +246,7 @@ Item { rightMargin: root.swipeBleed spacing: Theme.groupedListGap rowFadeEnabled: NotificationMetrics.animationsEnabled + fadeInitialRows: false model: ScriptModel { id: historyModel diff --git a/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml b/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml index fc52f654f..538491971 100644 --- a/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml +++ b/quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml @@ -176,6 +176,7 @@ DListView { } spacing: Theme.groupedListGap rowFadeEnabled: NotificationMetrics.animationsEnabled + fadeInitialRows: false onIsUserScrollingChanged: { if (isUserScrolling && keyboardController && keyboardController.keyboardNavigationActive) { diff --git a/quickshell/Modules/Settings/RegistryBrowserWindow.qml b/quickshell/Modules/Settings/RegistryBrowserWindow.qml index fd5b03e00..d039dc967 100644 --- a/quickshell/Modules/Settings/RegistryBrowserWindow.qml +++ b/quickshell/Modules/Settings/RegistryBrowserWindow.qml @@ -209,7 +209,6 @@ DFloatingWindow { anchors.right: parent.right anchors.top: aboveSearchSlot.bottom anchors.topMargin: aboveSearchSlot.height > 0 ? Theme.spacingM : 0 - height: Theme.fieldHeightLarge textColor: Theme.surfaceText font.pixelSize: Theme.fontSizeMedium placeholderText: root.searchPlaceholder diff --git a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml index ac6257b8c..d7554160c 100644 --- a/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml +++ b/quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml @@ -80,7 +80,6 @@ DFloatingWindow { DSearchField { id: searchField width: parent.width - height: Theme.fieldHeightLarge textColor: Theme.surfaceText font.pixelSize: Theme.fontSizeMedium placeholderText: I18n.tr("Search applications...")