From 01c63ebeadc83eb52486bbee4002aec417eec858 Mon Sep 17 00:00:00 2001 From: zach Date: Wed, 24 Jun 2026 23:06:29 +0200 Subject: [PATCH] blobpopup positioning and radius changes --- Components/VerticalFadeFlickable.qml | 2 +- Components/VerticalFadeListView.qml | 2 +- Modules/SettingsNew/Common/BlobPopup.qml | 6 +++--- Modules/SettingsNew/Common/PopupRow.qml | 4 +++- Modules/SettingsNew/NavPane/NavLocations.qml | 3 ++- Modules/SettingsNew/Pages/AppsPage.qml | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Components/VerticalFadeFlickable.qml b/Components/VerticalFadeFlickable.qml index edd63df..8cc61d7 100644 --- a/Components/VerticalFadeFlickable.qml +++ b/Components/VerticalFadeFlickable.qml @@ -7,7 +7,7 @@ CustomFlickable { id: root property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1 - property real fadeAmount: 0.2 + property real fadeAmount: 0.1 property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1 function fadeShouldBeActive(isStart: bool): bool { diff --git a/Components/VerticalFadeListView.qml b/Components/VerticalFadeListView.qml index 0c35590..5392d95 100644 --- a/Components/VerticalFadeListView.qml +++ b/Components/VerticalFadeListView.qml @@ -7,7 +7,7 @@ CustomListView { id: root property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1 - property real fadeAmount: 0.2 + property real fadeAmount: 0.1 property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1 function fadeShouldBeActive(isStart: bool): bool { diff --git a/Modules/SettingsNew/Common/BlobPopup.qml b/Modules/SettingsNew/Common/BlobPopup.qml index c4226b4..eeccdda 100644 --- a/Modules/SettingsNew/Common/BlobPopup.qml +++ b/Modules/SettingsNew/Common/BlobPopup.qml @@ -66,7 +66,7 @@ Item { group: blobGroup implicitHeight: parent.height implicitWidth: parent.width - radius: Appearance.rounding.large + radius: Appearance.rounding.small + Appearance.padding.small states: State { name: "open" @@ -86,8 +86,8 @@ Item { } Anim { - duration: Appearance.anim.durations.expressiveFastSpatial - easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial + duration: Appearance.anim.durations.expressiveFastEffects + easing.bezierCurve: Appearance.anim.curves.expressiveFastEffects properties: "topMargin,implicitHeight" } diff --git a/Modules/SettingsNew/Common/PopupRow.qml b/Modules/SettingsNew/Common/PopupRow.qml index 8778a90..3a49180 100644 --- a/Modules/SettingsNew/Common/PopupRow.qml +++ b/Modules/SettingsNew/Common/PopupRow.qml @@ -83,7 +83,7 @@ ConnectedRect { id: area anchors.fill: parent - cursorShape: undefined + cursorShape: popup.open ? Qt.ArrowCursor : undefined enabled: popup.open hoverEnabled: true parent: { @@ -94,6 +94,8 @@ ConnectedRect { const contentWin = win as Windows; // If inside the drawer content window, put it inside the interaction wrapper so hover works return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem; } + preventStealing: true + propagateComposedEvents: false z: popup.animDriver > 0 ? 1 : 0 onClicked: popup.open = false diff --git a/Modules/SettingsNew/NavPane/NavLocations.qml b/Modules/SettingsNew/NavPane/NavLocations.qml index 0b8b41a..6d5278a 100644 --- a/Modules/SettingsNew/NavPane/NavLocations.qml +++ b/Modules/SettingsNew/NavPane/NavLocations.qml @@ -6,13 +6,14 @@ import qs.Components import qs.Config import qs.Modules.SettingsNew -Flickable { +VerticalFadeFlickable { id: root required property SettingsState sState bottomMargin: Appearance.padding.large contentHeight: content.implicitHeight + fadeAmount: 0.1 topMargin: Appearance.padding.large ColumnLayout { diff --git a/Modules/SettingsNew/Pages/AppsPage.qml b/Modules/SettingsNew/Pages/AppsPage.qml index 0cb1376..2ba835d 100644 --- a/Modules/SettingsNew/Pages/AppsPage.qml +++ b/Modules/SettingsNew/Pages/AppsPage.qml @@ -93,7 +93,7 @@ PageBase { p = p.parent; return p?.opacity < 1; } - popup.topMovement: Math.max(0 - popupHeight, Appearance.padding.large) + popup.topMovement: Appearance.padding.large Loader { active: row.popup.animDriver > 0