forked from cwtch.im/ui
Merge branch 'textfix' of cwtch.im/ui into master
This commit is contained in:
commit
41b1db2e08
|
@ -74,21 +74,16 @@ func (this *InterfaceState) AddMessage(m *gobjects.Message) {
|
||||||
_, found := this.contacts[m.Handle]
|
_, found := this.contacts[m.Handle]
|
||||||
if !found {
|
if !found {
|
||||||
this.AddContact(&gobjects.Contact{
|
this.AddContact(&gobjects.Contact{
|
||||||
m.DisplayName,
|
|
||||||
m.Image,
|
|
||||||
m.Handle,
|
m.Handle,
|
||||||
|
m.Handle,
|
||||||
|
cwutil.RandomProfileImage(m.Handle),
|
||||||
"",
|
"",
|
||||||
1,
|
0,
|
||||||
0,
|
0,
|
||||||
false,
|
false,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
c := the.Peer.GetContact(m.Handle)
|
|
||||||
if c == nil {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
_, found = this.messages[m.Handle]
|
_, found = this.messages[m.Handle]
|
||||||
if !found {
|
if !found {
|
||||||
this.messages[m.Handle] = make([]*gobjects.Message, 0)
|
this.messages[m.Handle] = make([]*gobjects.Message, 0)
|
||||||
|
|
|
@ -102,6 +102,9 @@ ColumnLayout {
|
||||||
|
|
||||||
Flickable {
|
Flickable {
|
||||||
id: flkMessage
|
id: flkMessage
|
||||||
|
anchors.fill: parent//this does nothing! bug in qt
|
||||||
|
Layout.minimumWidth: parent.width
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
Layout.minimumHeight: rectMessage.height
|
Layout.minimumHeight: rectMessage.height
|
||||||
Layout.maximumHeight: rectMessage.height
|
Layout.maximumHeight: rectMessage.height
|
||||||
contentWidth: txtMessage.width
|
contentWidth: txtMessage.width
|
||||||
|
@ -120,6 +123,7 @@ ColumnLayout {
|
||||||
padding: 6
|
padding: 6
|
||||||
wrapMode: TextEdit.Wrap
|
wrapMode: TextEdit.Wrap
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
|
width: rectMessage.width
|
||||||
|
|
||||||
property bool skipOneUpdate: false
|
property bool skipOneUpdate: false
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue