diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/AddressBookTable.qml | 7 | ||||
| -rw-r--r-- | components/DashboardTable.qml | 2 | ||||
| -rw-r--r-- | components/TitleBar.qml | 16 |
3 files changed, 15 insertions, 10 deletions
diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml index 81343d4e..354ddfe2 100644 --- a/components/AddressBookTable.qml +++ b/components/AddressBookTable.qml @@ -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 diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml index 0e6d73f0..f5e04deb 100644 --- a/components/DashboardTable.qml +++ b/components/DashboardTable.qml @@ -192,7 +192,7 @@ ListView { anchors.bottomMargin: 11 anchors.rightMargin: 5 dataModel: dropModel - z: 5 + z: 1 onExpandedChanged: { if(expanded) { listView.previousItem = delegate diff --git a/components/TitleBar.qml b/components/TitleBar.qml index e18d1a86..28c6d89c 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -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 |