summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metawatch/metawatch.cpp4
-rw-r--r--metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml6
2 files changed, 7 insertions, 3 deletions
diff --git a/metawatch/metawatch.cpp b/metawatch/metawatch.cpp
index 3845817..783a44f 100644
--- a/metawatch/metawatch.cpp
+++ b/metawatch/metawatch.cpp
@@ -691,7 +691,9 @@ void MetaWatch::realReceive(bool block)
do {
qint64 dataRead;
+#if PROTOCOL_DEBUG
qDebug() << "received" << _socket->bytesAvailable() << "bytes";
+#endif
if (_partialReceived.type == 0) {
/* Still not received even the packet type */
@@ -729,7 +731,9 @@ void MetaWatch::realReceive(bool block)
_partialReceived.type = static_cast<MessageType>(header[2]);
_partialReceived.data.resize(header[1] - 6);
_partialReceived.options = header[3];
+#if PROTOCOL_DEBUG
qDebug() << "got header";
+#endif
}
/* We have the header; now, try to get the complete packet. */
diff --git a/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml b/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml
index 1a48118..3b6c44e 100644
--- a/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml
+++ b/metawatch/qml/com/javispedro/sowatch/metawatch/MWScrollable.qml
@@ -10,8 +10,8 @@ Flickable {
boundsBehavior: Flickable.StopAtBounds
flickableDirection: Flickable.VerticalFlick
- contentWidth: childrenRect.width
- contentHeight: childrenRect.height
+ contentWidth: contentItem.childrenRect.width
+ contentHeight: contentItem.childrenRect.height
function scrollDown() {
console.log(contentHeight + " " + height);
@@ -41,7 +41,7 @@ Flickable {
contentY = 0;
}
- Rectangle {
+ children: Rectangle {
id: indicatorCont
visible: flickable.indicator && (flickable.contentHeight > flickable.height)
anchors.top: parent.top