From 202153bab25f4cd97d545f0da36e91e4d03701fc Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 5 Mar 2019 14:02:29 -0800 Subject: [PATCH] fix implicitwidth issue --- qml/main.qml | 2 +- qml/panes/OverlayPane.qml | 45 ++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/qml/main.qml b/qml/main.qml index a07ef671..13075eb5 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -120,7 +120,7 @@ ApplicationWindow { Layout.fillHeight: true Layout.minimumWidth: Layout.maximumWidth 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{ diff --git a/qml/panes/OverlayPane.qml b/qml/panes/OverlayPane.qml index 0be61203..d40c4de9 100644 --- a/qml/panes/OverlayPane.qml +++ b/qml/panes/OverlayPane.qml @@ -14,9 +14,10 @@ ColumnLayout { property string name property bool accepted + StackToolbar { id: toolbar - //text: "open privacy exec" + aux.onClicked: { if (gcd.currentOpenConversation.length == 32) { @@ -32,9 +33,12 @@ ColumnLayout { RowLayout { visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32) + + Text { text: "Do you want to accept the invitation to " + overlay.name + "?" } + SimpleButton { text: "Accept" icon: "regular/heart" @@ -43,6 +47,7 @@ ColumnLayout { gcd.requestGroupSettings(gcd.currentOpenConversation) } } + SimpleButton { text: "Reject" icon: "regular/trash-alt" @@ -93,6 +98,7 @@ ColumnLayout { anchors.right: parent.right anchors.bottom: parent.bottom anchors.top: switcher.bottom + implicitHeight: height currentIndex: 0 property alias overlay: overlayStack.currentIndex @@ -102,22 +108,35 @@ ColumnLayout { 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 { - target: gcd + Connections { + target: gcd - onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) { - console.log("Supplied " + gid + " " + name + "Accepted " + accepted) - overlay.name = name - overlay.accepted = accepted - } - } + + onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) { + console.log("Supplied " + gid + " " + name + "Accepted " + accepted) + overlay.name = name + overlay.accepted = accepted + } + } } \ No newline at end of file