diff options
| author | bahbka <bahbka@bahbka.com> | 2014-07-06 16:48:58 +0400 |
|---|---|---|
| committer | bahbka <bahbka@bahbka.com> | 2014-07-06 16:48:58 +0400 |
| commit | fb3b3f66c3d1da13a8f5d6a686dcb27800c2cc8c (patch) | |
| tree | 1e3cc7cebdf1e933772b54e99c18189b9b9e3bd7 | |
| parent | 6643134bf1385e188bf6faab97b1687ea87df091 (diff) | |
Stretch content layer if small.
| -rw-r--r-- | appinfo.json | 4 | ||||
| -rw-r--r-- | resources/configuration.html | 2 | ||||
| -rw-r--r-- | src/pebble-my-data.c | 6 | ||||
| -rw-r--r-- | stuff/pebble-my-data.pbw | bin | 27332 -> 27351 bytes |
4 files changed, 8 insertions, 4 deletions
diff --git a/appinfo.json b/appinfo.json index 391dab4..82847dd 100644 --- a/appinfo.json +++ b/appinfo.json @@ -3,8 +3,8 @@ "shortName": "My Data", "longName": "My Data", "companyName": "bahbka", - "versionCode": 200, - "versionLabel": "2.0.0", + "versionCode": 201, + "versionLabel": "2.0.1", "watchapp": { "watchface": false }, diff --git a/resources/configuration.html b/resources/configuration.html index f2441f4..a2ac4a9 100644 --- a/resources/configuration.html +++ b/resources/configuration.html @@ -54,7 +54,7 @@ vim: sw=2 ts=2 expandtab ai --> </head> <body onload="put_config();"> <h1>My Data</h1> - <small>v2.0.0, by bahbka</small> + <small>v2.0.1, by bahbka</small> <hr size="1" /> <form action="javascript: get_config();" id="config_form"> diff --git a/src/pebble-my-data.c b/src/pebble-my-data.c index f15bcc2..8a164ad 100644 --- a/src/pebble-my-data.c +++ b/src/pebble-my-data.c @@ -267,7 +267,11 @@ static void update_info_layer(char *content, uint8_t font, bool scroll_up) { text_layer_set_text(text_info_layer, content); // set text GSize max_size = text_layer_get_content_size(text_info_layer); max_size.w = 144; - max_size.h += 4; + if (max_size.h < (168 - 31)) { + max_size.h = (168 - 31); + } else { + max_size.h += 4; + } text_layer_set_size(text_info_layer, max_size); // resize layer scroll_layer_set_content_size(scroll_layer, GSize(144, max_size.h)); // resize scroll layer if (scroll_up) { diff --git a/stuff/pebble-my-data.pbw b/stuff/pebble-my-data.pbw Binary files differindex 8247f3c..82e66a4 100644 --- a/stuff/pebble-my-data.pbw +++ b/stuff/pebble-my-data.pbw |