diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2011-12-03 00:00:07 +0100 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2011-12-03 00:00:07 +0100 |
| commit | cbf8e3ad49917dc71e8c5f6413c55f266c1c4ad3 (patch) | |
| tree | 0c377c57192afdde1f5bf9ea7af5ce9f3fe25a03 /metawatch | |
| parent | d5b5cfc83e1247ebc18ef2024f07bdd37d41164b (diff) | |
| download | sowatch-cbf8e3ad49917dc71e8c5f6413c55f266c1c4ad3.tar.gz sowatch-cbf8e3ad49917dc71e8c5f6413c55f266c1c4ad3.zip | |
change the way buttons work in declarativewatchlets
Diffstat (limited to 'metawatch')
| -rw-r--r-- | metawatch/metawatch.cpp | 11 | ||||
| -rw-r--r-- | metawatch/qml/com/javispedro/sowatch/metawatch/MWListView.qml | 8 | ||||
| -rw-r--r-- | metawatch/qml/com/javispedro/sowatch/metawatch/MWTitle.qml | 1 |
3 files changed, 9 insertions, 11 deletions
diff --git a/metawatch/metawatch.cpp b/metawatch/metawatch.cpp index 2106277..3f3b831 100644 --- a/metawatch/metawatch.cpp +++ b/metawatch/metawatch.cpp @@ -682,19 +682,10 @@ void MetaWatch::socketConnected() // Sync watch date & time setDateTime(QDateTime::currentDateTime()); - // Grab all buttons in both notification and application modes - grabButton(ApplicationMode, BtnA); - grabButton(ApplicationMode, BtnB); - grabButton(ApplicationMode, BtnC); - grabButton(ApplicationMode, BtnD); - grabButton(ApplicationMode, BtnE); - grabButton(ApplicationMode, BtnF); + // Grab a few buttons from Notification mode that we handle grabButton(NotificationMode, BtnA); grabButton(NotificationMode, BtnB); grabButton(NotificationMode, BtnC); - grabButton(NotificationMode, BtnD); - grabButton(NotificationMode, BtnE); - grabButton(NotificationMode, BtnF); // Call the MetaWatch Model-specific setup routines handleWatchConnected(); diff --git a/metawatch/qml/com/javispedro/sowatch/metawatch/MWListView.qml b/metawatch/qml/com/javispedro/sowatch/metawatch/MWListView.qml index 3e445fb..0fb0755 100644 --- a/metawatch/qml/com/javispedro/sowatch/metawatch/MWListView.qml +++ b/metawatch/qml/com/javispedro/sowatch/metawatch/MWListView.qml @@ -49,7 +49,13 @@ ListView { } if (currentItemTop <= 0) { // If the previous item now is still not visible, scroll - contentY -= 96/3; + var newContentY = contentY - 96/3; + + if (newContentY < 0) { + contentY = 0; // Never overscroll. + } else { + contentY = newContentY; + } } } } diff --git a/metawatch/qml/com/javispedro/sowatch/metawatch/MWTitle.qml b/metawatch/qml/com/javispedro/sowatch/metawatch/MWTitle.qml index 8aa494c..2c8b837 100644 --- a/metawatch/qml/com/javispedro/sowatch/metawatch/MWTitle.qml +++ b/metawatch/qml/com/javispedro/sowatch/metawatch/MWTitle.qml @@ -8,6 +8,7 @@ Rectangle { Row { anchors.fill: parent + anchors.margins: 1 Text { id: label font.bold: true |