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

This commit is contained in:
Sarah Jamie Lewis 2019-01-30 20:03:24 +00:00 committed by Gogs
commit fdb396bb75
3 changed files with 5 additions and 5 deletions

View File

@ -32,7 +32,7 @@ func IncomingListener(callback func(*gobjects.Message)) {
Handle: e.Data[event.GroupID],
From: e.Data[event.RemotePeer],
Message: e.Data[event.Data],
Image: cwutil.RandomGroupImage(e.Data[event.GroupID]),
Image: cwutil.RandomProfileImage(e.Data[event.RemotePeer]),
Timestamp: ts,
})
}

View File

@ -92,8 +92,8 @@ func initializeQtView() *quick.QQuickView {
quickcontrols2.QQuickStyle_SetStyle("Universe")
view := quick.NewQQuickView(nil)
view.SetResizeMode(quick.QQuickView__SizeRootObjectToView)
view.SetMinimumHeight(280)
view.SetMinimumWidth(300)
view.SetMinimumHeight(800) // these end up getting overridden by main.qml
view.SetMinimumWidth(1200)
view.SetTitle("cwtch")
return view

View File

@ -13,8 +13,8 @@ import "utils.js" as Utils
Item {
id: windowItem
width: 525
height: 500
width: 1200
height: 800
readonly property real ratio: height / width