From 1f687cb616ab8e89165a2f640337da8c7d75b28c Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Mon, 4 Feb 2019 15:00:12 -0800
Subject: [PATCH] various layout fixes

---
 go/gothings/uistate.go           |   2 ++
 qml/main.qml                     |   6 +++---
 qml/panes/OverlayPane.qml        |   2 +-
 qml/widgets/InplaceEditText.qmlc | Bin 6248 -> 6240 bytes
 qml/widgets/MyProfile.qml        |  21 ++++++++++++---------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/go/gothings/uistate.go b/go/gothings/uistate.go
index c870d53..515511b 100644
--- a/go/gothings/uistate.go
+++ b/go/gothings/uistate.go
@@ -6,6 +6,7 @@ import (
 	"cwtch.im/ui/go/the"
 	"encoding/base32"
 	"git.openprivacy.ca/openprivacy/libricochet-go/log"
+	"runtime/debug"
 	"strings"
 )
 
@@ -32,6 +33,7 @@ func (this *InterfaceState) AddContact(c *gobjects.Contact) {
 		return
 	} else if len(c.Handle) != 56 {
 		log.Errorf("sorry, unable to handle AddContact(%v)", c.Handle)
+		debug.PrintStack()
 		return
 	}
 
diff --git a/qml/main.qml b/qml/main.qml
index fa962ed..cb8baa3 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -145,14 +145,14 @@ Item {
 				property string title
 
 
-				Item {} // empty
+				Item { anchors.fill: parent } // empty
 
 				OverlayPane { // messagePane
 					title: theStack.title
 					anchors.fill: parent
 				}
 
-				SettingsPane{}
+				SettingsPane{ anchors.fill: parent }
 
 				ColumnLayout { // userProfilePane
 					anchors.fill: parent
@@ -168,7 +168,7 @@ Item {
 					Label { text: "per-user things like contact name and picture will be edited here" }
 				}
 
-				GroupSettingsPane{}
+				GroupSettingsPane{ anchors.fill: parent }
 
 				AddGroupPane { anchors.fill: parent }
 			}
diff --git a/qml/panes/OverlayPane.qml b/qml/panes/OverlayPane.qml
index ea5f74e..0f30a73 100644
--- a/qml/panes/OverlayPane.qml
+++ b/qml/panes/OverlayPane.qml
@@ -22,7 +22,7 @@ ColumnLayout {
 		}
 	}
 
-    Row {
+    RowLayout {
        id: switcher
 
 
diff --git a/qml/widgets/InplaceEditText.qmlc b/qml/widgets/InplaceEditText.qmlc
index e70101e02c27c5c53815ef35cebedeb8452bd889..ef3ccb28bb2560d3199c497cd381344ac05f2bcc 100644
GIT binary patch
delta 119
zcmaE1@W4Q_u*@VmC9xz?l7WGNk(-s_<jo!S8H@}J2@@ra1<X?2QmXr|3$Q-g)LC^}
z<KV`a9syPd2?mCM&2I$`voX3(-YBl9oym{~g!&BW4EaE^n4yRv8AvBHlrxk7$qWWP
RhD?TBphzi0=44ihWB{omAwd8D

delta 127
zcmaE0@WMc{u*@VmC9xz?l7WGNk(-s_*$#<CX^adE851Rq1^m}^w<-5byB}rW(YuFt
zLFvYr9syPl2?mCU&2I$`voU&3-YBkUT*Q#iP{feQkOzeN3<W@TK0_8mDnl|u2}3bZ
Yq!=iY45X8Q;-x?}$qcEJ|B5FA0NRKoi2wiq

diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml
index da189a6..d4400cd 100644
--- a/qml/widgets/MyProfile.qml
+++ b/qml/widgets/MyProfile.qml
@@ -95,16 +95,17 @@ ColumnLayout {
 		}
 	}
 
-	//InplaceEditText { // USER NICKNAME
-	//	id: lblNick
-	//	anchors.horizontalCenter: parent.horizontalCenter
-	//	width: parent.width
-	//
-	//	onUpdated: {
-	//		gcd.updateNick(lblNick.text)
-	//	}
-	//}
+	InplaceEditText { // USER NICKNAME
+		id: lblNick
+		anchors.horizontalCenter: parent.horizontalCenter
+		width: parent.width
 
+		onUpdated: {
+			gcd.updateNick(lblNick.text)
+		}
+	}
+
+	/*
 	Text {
 		id: txtNick
 		fontSizeMode: Text.HorizontalFit
@@ -137,6 +138,7 @@ ColumnLayout {
 			txtNick.visible = true
 		}
 	}
+	*/
 
 	ScalingLabel { // ONION ADDRESS
 		id: lblOnion
@@ -246,6 +248,7 @@ ColumnLayout {
 
 		onUpdateMyProfile: function(_nick, _onion, _image) {
 			nick = _nick
+			lblNick.text = _nick
 			onion = _onion
 			image = _image
 		}