mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-16 15:58:11 +00:00
This commit is contained in:
parent
0e5dbbc197
commit
2f54bb12eb
4 changed files with 17 additions and 14 deletions
|
@ -12,7 +12,10 @@ ListView {
|
|||
height: 64
|
||||
width: listView.width
|
||||
color: index % 2 ? "#F8F8F8" : "#FFFFFF"
|
||||
function collapseDropdown() { dropdown.expanded = false }
|
||||
function collapseDropdown() {
|
||||
z = 1
|
||||
dropdown.expanded = false
|
||||
}
|
||||
|
||||
Text {
|
||||
id: descriptionText
|
||||
|
@ -95,8 +98,6 @@ ListView {
|
|||
dataModel: dropModel
|
||||
z: 1
|
||||
onExpandedChanged: {
|
||||
if(listView.previousItem !== undefined && listView.previousItem !== delegate)
|
||||
listView.previousItem.collapseDropdown()
|
||||
if(expanded) {
|
||||
listView.previousItem = delegate
|
||||
listView.currentIndex = index
|
||||
|
|
|
@ -192,7 +192,7 @@ ListView {
|
|||
anchors.bottomMargin: 11
|
||||
anchors.rightMargin: 5
|
||||
dataModel: dropModel
|
||||
z: 5
|
||||
z: 1
|
||||
onExpandedChanged: {
|
||||
if(expanded) {
|
||||
listView.previousItem = delegate
|
||||
|
|
|
@ -7,7 +7,7 @@ Rectangle {
|
|||
color: "#000000"
|
||||
y: -height
|
||||
property int mouseX: 0
|
||||
property int mouseY: 0
|
||||
property bool containsMouse: false
|
||||
property alias maximizeButtonVisible: maximizeButton.visible
|
||||
signal goToBasicVersion(bool yes)
|
||||
|
||||
|
@ -57,7 +57,7 @@ Rectangle {
|
|||
anchors.bottom: parent.bottom
|
||||
|
||||
Rectangle {
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
width: height
|
||||
|
@ -78,7 +78,7 @@ Rectangle {
|
|||
}
|
||||
|
||||
Rectangle {
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
width: height
|
||||
|
@ -92,13 +92,17 @@ Rectangle {
|
|||
MouseArea {
|
||||
id: minimizeArea
|
||||
anchors.fill: parent
|
||||
onClicked: appWindow.visibility = Window.Minimized
|
||||
onClicked: {
|
||||
appWindow.visibility = Window.Minimized
|
||||
// parent.containsMouse = Qt.binding(function(){ return titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width &&
|
||||
// appWindow.visibility !== Window.Minimized })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: maximizeButton
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
width: height
|
||||
|
@ -122,7 +126,7 @@ Rectangle {
|
|||
}
|
||||
|
||||
Rectangle {
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
width: height
|
||||
|
|
6
main.qml
6
main.qml
|
@ -156,10 +156,8 @@ ApplicationWindow {
|
|||
propagateComposedEvents: true
|
||||
onPressed: mouse.accepted = false
|
||||
onReleased: mouse.accepted = false
|
||||
onMouseXChanged: {
|
||||
titleBar.mouseX = mouseX
|
||||
titleBar.mouseY = mouseY
|
||||
}
|
||||
onMouseXChanged: titleBar.mouseX = mouseX
|
||||
onContainsMouseChanged: titleBar.containsMouse = containsMouse
|
||||
}
|
||||
|
||||
SequentialAnimation {
|
||||
|
|
Loading…
Reference in a new issue