nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: utilities recording modal bg

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-13 23:03:36 +10:00
parent 50c4eaf75b
commit c517b71024
4 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/drawers/ContentWindow.qml
View file

@ -250,6 +250,7 @@ StyledWindow {
borderThickness: root.borderThickness borderThickness: root.borderThickness
utilities.horizontalStretch: (sidebarBg.rawDeformMatrix.m11 - 1) / 2 + 1 utilities.horizontalStretch: (sidebarBg.rawDeformMatrix.m11 - 1) / 2 + 1
utilities.deformMatrix: utilsBg.rawDeformMatrix
dashboard.transform: Matrix4x4 { dashboard.transform: Matrix4x4 {
matrix: dashBg.deformMatrix matrix: dashBg.deformMatrix

2
modules/utilities/Content.qml
View file

@ -11,6 +11,7 @@ Item {
required property var props required property var props
required property DrawerVisibilities visibilities required property DrawerVisibilities visibilities
required property BarPopouts.Wrapper popouts required property BarPopouts.Wrapper popouts
required property matrix4x4 deformMatrix
implicitWidth: layout.implicitWidth implicitWidth: layout.implicitWidth
implicitHeight: layout.implicitHeight implicitHeight: layout.implicitHeight
@ -37,5 +38,6 @@ Item {
RecordingDeleteModal { RecordingDeleteModal {
props: root.props props: root.props
deformMatrix: root.deformMatrix
} }
} }

52
modules/utilities/RecordingDeleteModal.qml
View file

@ -14,6 +14,7 @@ Loader {
id: root id: root
required property var props required property var props
required property matrix4x4 deformMatrix
asynchronous: true asynchronous: true
anchors.fill: parent anchors.fill: parent
@ -40,7 +41,9 @@ Loader {
StyledRect { StyledRect {
anchors.fill: parent anchors.fill: parent
topLeftRadius: Config.border.rounding anchors.rightMargin: -parent.width * (1 - root.deformMatrix.m11) / 2 // Additional bit to account for deform
anchors.bottomMargin: -parent.height * 0.1 // Additional bit to account for overshoot
topLeftRadius: Tokens.rounding.large
color: Colours.palette.m3scrim color: Colours.palette.m3scrim
} }
@ -51,13 +54,14 @@ Loader {
preferredRendererType: Shape.CurveRenderer preferredRendererType: Shape.CurveRenderer
asynchronous: true asynchronous: true
// Bottom left
ShapePath { ShapePath {
startX: -Config.border.rounding * 2 startX: -root.Config.border.smoothing * 2
startY: shape.height - Config.border.thickness startY: shape.height - root.Config.border.thickness
strokeWidth: 0 strokeWidth: 0
fillGradient: LinearGradient { fillGradient: LinearGradient {
orientation: LinearGradient.Horizontal orientation: LinearGradient.Horizontal
x1: -Config.border.rounding * 2 x1: -root.Config.border.smoothing * 2
GradientStop { GradientStop {
position: 0 position: 0
@ -70,31 +74,34 @@ Loader {
} }
PathLine { PathLine {
relativeX: Config.border.rounding relativeX: root.Config.border.smoothing
relativeY: 0 relativeY: 0
} }
PathArc { PathCubic {
relativeY: -Config.border.rounding relativeX: root.Config.border.smoothing
radiusX: Config.border.rounding relativeY: -root.Config.border.smoothing
radiusY: Config.border.rounding relativeControl1X: root.Config.border.smoothing * 0.93
direction: PathArc.Counterclockwise relativeControl1Y: -root.Config.border.smoothing * 0.07
relativeControl2X: root.Config.border.smoothing * 0.93
relativeControl2Y: -root.Config.border.smoothing * 0.07
} }
PathLine { PathLine {
relativeX: 0 relativeX: 0
relativeY: Config.border.rounding + Config.border.thickness relativeY: root.Config.border.smoothing + root.Config.border.thickness
} }
PathLine { PathLine {
relativeX: -Config.border.rounding * 2 relativeX: -root.Config.border.smoothing * 2
relativeY: 0 relativeY: 0
} }
} }
// Top right curve
ShapePath { ShapePath {
startX: shape.width - Config.border.rounding - Config.border.thickness startX: shape.width - root.Config.border.smoothing - root.Config.border.thickness + (1 - root.deformMatrix.m11) * shape.width / 2
strokeWidth: 0 strokeWidth: 0
fillGradient: LinearGradient { fillGradient: LinearGradient {
orientation: LinearGradient.Vertical orientation: LinearGradient.Vertical
y1: -Config.border.rounding * 2 y1: -root.Config.border.smoothing * 2
GradientStop { GradientStop {
position: 0 position: 0
@ -106,19 +113,20 @@ Loader {
} }
} }
PathArc { PathCubic {
relativeX: Config.border.rounding relativeX: root.Config.border.smoothing
relativeY: -Config.border.rounding relativeY: -root.Config.border.smoothing
radiusX: Config.border.rounding relativeControl1X: root.Config.border.smoothing * 0.93
radiusY: Config.border.rounding relativeControl1Y: -root.Config.border.smoothing * 0.07
direction: PathArc.Counterclockwise relativeControl2X: root.Config.border.smoothing * 0.93
relativeControl2Y: -root.Config.border.smoothing * 0.07
} }
PathLine { PathLine {
relativeX: 0 relativeX: 0
relativeY: -Config.border.rounding relativeY: -root.Config.border.smoothing
} }
PathLine { PathLine {
relativeX: Config.border.thickness relativeX: root.Config.border.thickness
relativeY: 0 relativeY: 0
} }
PathLine { PathLine {

2
modules/utilities/Wrapper.qml
View file

@ -14,6 +14,7 @@ Item {
required property Sidebar.Wrapper sidebar required property Sidebar.Wrapper sidebar
required property BarPopouts.Wrapper popouts required property BarPopouts.Wrapper popouts
property real horizontalStretch property real horizontalStretch
property matrix4x4 deformMatrix
readonly property PersistentProperties props: PersistentProperties { readonly property PersistentProperties props: PersistentProperties {
property bool recordingListExpanded: false property bool recordingListExpanded: false
@ -84,6 +85,7 @@ Item {
props: root.props props: root.props
visibilities: root.visibilities visibilities: root.visibilities
popouts: root.popouts popouts: root.popouts
deformMatrix: root.deformMatrix
} }
} }
} }