forked from cwtch.im/ui
Merge branch 'resizebug' of cwtch.im/ui into master
This commit is contained in:
commit
23d0b36e83
|
@ -12,13 +12,11 @@ import "../utils.js" as Utils
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
|
|
||||||
Flickable { // THE MESSAGE LIST ITSELF
|
Flickable { // THE MESSAGE LIST ITSELF
|
||||||
id: sv
|
id: sv
|
||||||
clip: true
|
clip: true
|
||||||
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.maximumWidth: parent.width
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
contentWidth: colMessages.width
|
contentWidth: colMessages.width
|
||||||
contentHeight: colMessages.height
|
contentHeight: colMessages.height
|
||||||
|
@ -104,9 +102,6 @@ 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
|
||||||
|
@ -125,8 +120,6 @@ ColumnLayout {
|
||||||
padding: 6
|
padding: 6
|
||||||
wrapMode: TextEdit.Wrap
|
wrapMode: TextEdit.Wrap
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
width: rectMessage.width
|
|
||||||
//height: parent.height
|
|
||||||
|
|
||||||
property bool skipOneUpdate: false
|
property bool skipOneUpdate: false
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue