fix up Tray.qml because it used retarded logic before
This commit is contained in:
parent
ecbced9365
commit
6107b30a64
2 changed files with 17 additions and 11 deletions
|
|
@ -7,15 +7,13 @@ import QtQuick.Layouts
|
||||||
import qs
|
import qs
|
||||||
import qs.settings
|
import qs.settings
|
||||||
|
|
||||||
Rectangle {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
color: Colors.base01
|
|
||||||
visible: iconRepeater.count != 0
|
visible: iconRepeater.count != 0
|
||||||
radius: Config.rounding
|
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
required property double moduleHeight
|
required property double moduleHeight
|
||||||
implicitHeight: moduleHeight
|
implicitHeight: moduleHeight
|
||||||
implicitWidth: iconlayout.implicitWidth + 16
|
implicitWidth: iconlayout.implicitWidth
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: iconlayout
|
id: iconlayout
|
||||||
|
|
@ -23,10 +21,15 @@ Rectangle {
|
||||||
Repeater {
|
Repeater {
|
||||||
id: iconRepeater
|
id: iconRepeater
|
||||||
model: SystemTray.items
|
model: SystemTray.items
|
||||||
delegate: WrapperMouseArea {
|
delegate: Rectangle {
|
||||||
id: iconWrapper
|
id: iconWrapper
|
||||||
|
color: Colors.base01
|
||||||
required property var modelData
|
required property var modelData
|
||||||
child: IconImage {
|
implicitWidth: root.moduleHeight + 8
|
||||||
|
implicitHeight: root.moduleHeight
|
||||||
|
radius: Config.rounding
|
||||||
|
IconImage {
|
||||||
|
anchors.centerIn: parent
|
||||||
source: iconWrapper.modelData.icon
|
source: iconWrapper.modelData.icon
|
||||||
implicitSize: 16
|
implicitSize: 16
|
||||||
}
|
}
|
||||||
|
|
@ -35,10 +38,13 @@ Rectangle {
|
||||||
anchor.item: iconWrapper
|
anchor.item: iconWrapper
|
||||||
menu: iconWrapper.modelData.menu
|
menu: iconWrapper.modelData.menu
|
||||||
}
|
}
|
||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
MouseArea {
|
||||||
onClicked: mouse => {
|
anchors.fill: parent
|
||||||
if (mouse.button == Qt.RightButton) {
|
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||||
menu.open();
|
onClicked: mouse => {
|
||||||
|
if (mouse.button == Qt.RightButton) {
|
||||||
|
menu.open();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ Rectangle {
|
||||||
required property double moduleHeight
|
required property double moduleHeight
|
||||||
radius: Config.rounding
|
radius: Config.rounding
|
||||||
color: 'transparent'
|
color: 'transparent'
|
||||||
implicitWidth: wsLayout.implicitWidth + 10
|
implicitWidth: wsLayout.implicitWidth
|
||||||
implicitHeight: moduleHeight
|
implicitHeight: moduleHeight
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue