AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added transparent-background, for blocking clicked event

Browse source
This commit is contained in:
ronoaer 2023-10-15 15:17:04 +08:00
parent 384ce9853b
commit 8c1835950b
15 changed files with 134 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

64
client/ui/qml/Controls2/Drawer2Type.qml
View file

@ -16,8 +16,6 @@ Item {
visible: false
parent: Overlay.overlay
signal close()
property bool needCloseButton: true
@ -27,7 +25,10 @@ Item {
property int collapsedHeight: 0
property bool needCollapsed: false
property double scaely
property int contentHeight: 0
property Item contentParent: contentArea
// property bool inContentArea: false
y: parent.height - root.height
@ -37,23 +38,49 @@ Item {
id: draw2Background
anchors { left: root.left; right: root.right; top: root.top }
height: root.height
height: root.parent.height
width: parent.width
radius: 16
color: root.defaultColor
border.color: root.borderColor
color: "transparent"
border.color: "transparent" //"green"
border.width: 1
visible: true
Rectangle {
width: parent.radius
height: parent.radius
anchors.bottom: parent.bottom
id: semiArea
anchors.top: parent.top
height: parent.height - contentHeight
anchors.right: parent.right
anchors.left: parent.left
color: parent.color
visible: true
color: "transparent"
}
Rectangle {
id: contentArea
anchors.top: semiArea.bottom
height: contentHeight
radius: 16
color: root.defaultColor
border.width: 1
border.color: root.borderColor
width: parent.width
visible: true
Rectangle {
width: parent.radius
height: parent.radius
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.left: parent.left
color: parent.color
}
}
}
MouseArea {
id: fullArea
anchors.fill: parent
enabled: (root.state === "expanded" || root.state === "opened")
onClicked: {
@ -75,6 +102,7 @@ Item {
id: dragArea
anchors.fill: parent
cursorShape: (root.state === "opened" || root.state === "expanded") ? Qt.PointingHandCursor : Qt.ArrowCursor
hoverEnabled: true
@ -108,12 +136,14 @@ Item {
}
onClicked: {
if (root.state === "opened") {
root.state = "closed"
if (root.state === "expanded") {
root.state = "collapsed"
return
}
if (root.state == "expanded") {
root.state == "collapsed"
if (root.state === "opened") {
root.state = "closed"
return
}
}
}
@ -217,7 +247,7 @@ Item {
target: root
property: "y"
from: parent.height
to: parent.height - root.height
to: 0
duration: 200
}
@ -226,9 +256,11 @@ Item {
return
}
root.y = 0
root.state = "opened"
root.visible = true
root.y = parent.height - root.height
root.height = parent.height
contentArea.height = contentHeight
dragArea.drag.maximumY = parent.height
dragArea.drag.minimumY = parent.height - root.height

17
client/ui/qml/Controls2/DropDownType.qml
View file

@ -40,6 +40,8 @@ Item {
property alias menuVisible: menu.visible
property Item drawerParent: root
implicitWidth: rootButtonContent.implicitWidth
implicitHeight: rootButtonContent.implicitHeight
@ -161,18 +163,21 @@ Item {
}
}
// Drawer2Type {
DrawerType {
//DrawerType {
Drawer2Type {
id: menu
width: parent.width
height: parent.height * drawerHeight
parent: drawerParent
// parent: root.parent.parent
width: parent.width
height: parent.height
contentHeight: parent.height * drawerHeight
ColumnLayout {
id: header
parent: menu.contentParent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
@ -187,6 +192,8 @@ Item {
}
FlickableType {
parent: menu.contentParent
anchors.top: header.bottom
anchors.topMargin: 16
contentHeight: col.implicitHeight