forked from cwtch.im/ui
fix implicitwidth issue
This commit is contained in:
parent
ebdaf54ff9
commit
202153bab2
|
@ -120,7 +120,7 @@ ApplicationWindow {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.minimumWidth: Layout.maximumWidth
|
Layout.minimumWidth: Layout.maximumWidth
|
||||||
Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
|
Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
|
||||||
visible: (ratio <= 1.08 && windowItem.width >= 500) || theStack.pane == theStack.emptyPane
|
visible: (ratio <= 1.08 && windowItem.width >= 700) || theStack.pane == theStack.emptyPane
|
||||||
|
|
||||||
|
|
||||||
ContactList{
|
ContactList{
|
||||||
|
|
|
@ -14,9 +14,10 @@ ColumnLayout {
|
||||||
property string name
|
property string name
|
||||||
property bool accepted
|
property bool accepted
|
||||||
|
|
||||||
|
|
||||||
StackToolbar {
|
StackToolbar {
|
||||||
id: toolbar
|
id: toolbar
|
||||||
//text: "open privacy exec"
|
|
||||||
|
|
||||||
aux.onClicked: {
|
aux.onClicked: {
|
||||||
if (gcd.currentOpenConversation.length == 32) {
|
if (gcd.currentOpenConversation.length == 32) {
|
||||||
|
@ -32,9 +33,12 @@ ColumnLayout {
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32)
|
visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32)
|
||||||
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
text: "Do you want to accept the invitation to " + overlay.name + "?"
|
text: "Do you want to accept the invitation to " + overlay.name + "?"
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleButton {
|
SimpleButton {
|
||||||
text: "Accept"
|
text: "Accept"
|
||||||
icon: "regular/heart"
|
icon: "regular/heart"
|
||||||
|
@ -43,6 +47,7 @@ ColumnLayout {
|
||||||
gcd.requestGroupSettings(gcd.currentOpenConversation)
|
gcd.requestGroupSettings(gcd.currentOpenConversation)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleButton {
|
SimpleButton {
|
||||||
text: "Reject"
|
text: "Reject"
|
||||||
icon: "regular/trash-alt"
|
icon: "regular/trash-alt"
|
||||||
|
@ -93,6 +98,7 @@ ColumnLayout {
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.top: switcher.bottom
|
anchors.top: switcher.bottom
|
||||||
|
implicitHeight: height
|
||||||
currentIndex: 0
|
currentIndex: 0
|
||||||
|
|
||||||
property alias overlay: overlayStack.currentIndex
|
property alias overlay: overlayStack.currentIndex
|
||||||
|
@ -102,18 +108,31 @@ ColumnLayout {
|
||||||
readonly property int game1Overlay: 3
|
readonly property int game1Overlay: 3
|
||||||
|
|
||||||
|
|
||||||
ChatOverlay {} //0
|
ChatOverlay { //0
|
||||||
|
Layout.maximumHeight: overlayStack.height
|
||||||
|
Layout.maximumWidth: overlayStack.width
|
||||||
|
}
|
||||||
|
|
||||||
ListOverlay{} //1
|
ListOverlay{ //1
|
||||||
|
Layout.maximumHeight: overlayStack.height
|
||||||
|
Layout.maximumWidth: overlayStack.width
|
||||||
|
}
|
||||||
|
|
||||||
BulletinOverlay{} //2
|
BulletinOverlay{ //2
|
||||||
|
Layout.maximumHeight: overlayStack.height
|
||||||
|
Layout.maximumWidth: overlayStack.width
|
||||||
|
}
|
||||||
|
|
||||||
Game1Overlay{} //3
|
Game1Overlay{ //3
|
||||||
|
Layout.maximumHeight: overlayStack.height
|
||||||
|
Layout.maximumWidth: overlayStack.width
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: gcd
|
target: gcd
|
||||||
|
|
||||||
|
|
||||||
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
|
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
|
||||||
console.log("Supplied " + gid + " " + name + "Accepted " + accepted)
|
console.log("Supplied " + gid + " " + name + "Accepted " + accepted)
|
||||||
overlay.name = name
|
overlay.name = name
|
||||||
|
|
Loading…
Reference in New Issue