blobpopup positioning and radius changes
This commit is contained in:
@@ -7,7 +7,7 @@ CustomFlickable {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
|
property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
|
||||||
property real fadeAmount: 0.2
|
property real fadeAmount: 0.1
|
||||||
property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
|
property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
|
||||||
|
|
||||||
function fadeShouldBeActive(isStart: bool): bool {
|
function fadeShouldBeActive(isStart: bool): bool {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ CustomListView {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
|
property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
|
||||||
property real fadeAmount: 0.2
|
property real fadeAmount: 0.1
|
||||||
property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
|
property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
|
||||||
|
|
||||||
function fadeShouldBeActive(isStart: bool): bool {
|
function fadeShouldBeActive(isStart: bool): bool {
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ Item {
|
|||||||
group: blobGroup
|
group: blobGroup
|
||||||
implicitHeight: parent.height
|
implicitHeight: parent.height
|
||||||
implicitWidth: parent.width
|
implicitWidth: parent.width
|
||||||
radius: Appearance.rounding.large
|
radius: Appearance.rounding.small + Appearance.padding.small
|
||||||
|
|
||||||
states: State {
|
states: State {
|
||||||
name: "open"
|
name: "open"
|
||||||
@@ -86,8 +86,8 @@ Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Anim {
|
Anim {
|
||||||
duration: Appearance.anim.durations.expressiveFastSpatial
|
duration: Appearance.anim.durations.expressiveFastEffects
|
||||||
easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
|
easing.bezierCurve: Appearance.anim.curves.expressiveFastEffects
|
||||||
properties: "topMargin,implicitHeight"
|
properties: "topMargin,implicitHeight"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ ConnectedRect {
|
|||||||
id: area
|
id: area
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: undefined
|
cursorShape: popup.open ? Qt.ArrowCursor : undefined
|
||||||
enabled: popup.open
|
enabled: popup.open
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
parent: {
|
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
|
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;
|
return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem;
|
||||||
}
|
}
|
||||||
|
preventStealing: true
|
||||||
|
propagateComposedEvents: false
|
||||||
z: popup.animDriver > 0 ? 1 : 0
|
z: popup.animDriver > 0 ? 1 : 0
|
||||||
|
|
||||||
onClicked: popup.open = false
|
onClicked: popup.open = false
|
||||||
|
|||||||
@@ -6,13 +6,14 @@ import qs.Components
|
|||||||
import qs.Config
|
import qs.Config
|
||||||
import qs.Modules.SettingsNew
|
import qs.Modules.SettingsNew
|
||||||
|
|
||||||
Flickable {
|
VerticalFadeFlickable {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
required property SettingsState sState
|
required property SettingsState sState
|
||||||
|
|
||||||
bottomMargin: Appearance.padding.large
|
bottomMargin: Appearance.padding.large
|
||||||
contentHeight: content.implicitHeight
|
contentHeight: content.implicitHeight
|
||||||
|
fadeAmount: 0.1
|
||||||
topMargin: Appearance.padding.large
|
topMargin: Appearance.padding.large
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ PageBase {
|
|||||||
p = p.parent;
|
p = p.parent;
|
||||||
return p?.opacity < 1;
|
return p?.opacity < 1;
|
||||||
}
|
}
|
||||||
popup.topMovement: Math.max(0 - popupHeight, Appearance.padding.large)
|
popup.topMovement: Appearance.padding.large
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
active: row.popup.animDriver > 0
|
active: row.popup.animDriver > 0
|
||||||
|
|||||||
Reference in New Issue
Block a user