Merge branch 'divedetailssplit' of github.com:sebasje/subsurface

This commit is contained in:
Dirk Hohndel 2015-12-07 15:14:48 -08:00
commit 1f41d933c0

View file

@ -20,30 +20,19 @@ MobileComponents.Page {
anchors.fill: parent anchors.fill: parent
contentHeight: logContent.height contentHeight: logContent.height
clip: true clip: true
Item {
id: logContent
width: logFlick.width
height: childrenRect.height + MobileComponents.Units.smallSpacing * 2
ColumnLayout { ColumnLayout {
anchors { width: logFlick.width
left: parent.left
right: parent.right
top: parent.top
margins: MobileComponents.Units.smallSpacing
}
spacing: MobileComponents.Units.smallSpacing spacing: MobileComponents.Units.smallSpacing
MobileComponents.Heading {
Text { text: "Application Log"
width: logWindow.width }
wrapMode: Text.Wrap MobileComponents.Label {
id: logContent
Layout.preferredWidth: parent.width
Layout.maximumWidth: parent.width
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
text: manager.logText text: manager.logText
} }
Item {
height: MobileComponents.Units.gridUnit * 3
width: height
}
}
} }
} }
} }