Merge branch 'textfix' of cwtch.im/ui into master

2019-02-13 04:26:35 +00:00 · 2019-02-13 04:26:35 +00:00 · c11450e6d8
parent 68572a8cc0 98b83cf51a
commit c11450e6d8
3 changed files with 2 additions and 2 deletions
--- a/qml/panes/GroupSettingsPane.qml
+++ b/qml/panes/GroupSettingsPane.qml
@ -17,6 +17,7 @@ ColumnLayout { // groupSettingsPane
 	StackToolbar {
 		id: toolbar
 		aux.visible: false
+		back.onClicked: theStack.pane = theStack.messagePane
 	}

    Column {
--- a/qml/panes/OverlayPane.qml
+++ b/qml/panes/OverlayPane.qml
@ -25,6 +25,7 @@ ColumnLayout {
 			    gcd.requestPeerSettings()
 			}
 		}
+		back.visible: false
 	}

    RowLayout {
--- a/qml/widgets/StackToolbar.qml
+++ b/qml/widgets/StackToolbar.qml
@ -28,8 +28,6 @@ Rectangle { // OVERHEAD BAR ON STACK PANE
 		anchors.left: parent.left
 		anchors.verticalCenter: parent.verticalCenter
 		anchors.leftMargin: 6
-		visible: ratio >= 1.08 || windowItem.width < 500
-
 		onClicked: theStack.pane = theStack.emptyPane
 	}