... | ... |
@@ -198,37 +198,39 @@ var pageClass = { |
198 | 198 |
if (contains(objects[o], 'scrollgroup')) { |
199 | 199 |
if (objects[o].scrollgroup < scroll.lines) |
200 | 200 |
lines += 1; |
201 |
- _textWidth += size(objects[o].text) * 10; |
|
201 |
+ _textWidth += size(objects[o].text); |
|
202 | 202 |
if (_textWidth > textWidth) textWidth = _textWidth; |
203 | 203 |
_textWidth = 0; |
204 | 204 |
} |
205 | 205 |
else { |
206 | 206 |
lines += 1; |
207 |
- _textWidth += size(objects[o].text) * 10; |
|
207 |
+ _textWidth += size(objects[o].text); |
|
208 | 208 |
if (_textWidth > textWidth) textWidth = _textWidth; |
209 | 209 |
_textWidth = 0; |
210 | 210 |
} |
211 | 211 |
} |
212 | 212 |
else { |
213 | 213 |
lines += 1; |
214 |
- _textWidth += size(objects[o].text) * 10; |
|
214 |
+ _textWidth += size(objects[o].text); |
|
215 | 215 |
if (_textWidth > textWidth) textWidth = _textWidth; |
216 | 216 |
_textWidth = 0; |
217 | 217 |
} |
218 | 218 |
} |
219 | 219 |
elsif (objects[o].type == 'title') { |
220 | 220 |
lines += 1; |
221 |
- _textWidth = size(objects[o].text) * 10; |
|
221 |
+ _textWidth = size(objects[o].text); |
|
222 | 222 |
if (_textWidth > textWidth) textWidth = _textWidth; |
223 | 223 |
_textWidth = 0; |
224 | 224 |
} |
225 | 225 |
elsif (objects[o].type != 'separator') { |
226 |
- _textWidth += size(objects[o].text) * 10; |
|
226 |
+ _textWidth += size(objects[o].text); |
|
227 | 227 |
} |
228 | 228 |
|
229 | 229 |
if (contains(objects[o], 'type') and objects[o].type == 'separator') |
230 | 230 |
geometry.sep += 1; |
231 | 231 |
} |
232 |
+ textWidth += 1; |
|
233 |
+ textWidth *= 10; |
|
232 | 234 |
if (!contains(geometry, 'l')) geometry.l = lines; |
233 | 235 |
if (!contains(geometry, 'x')) geometry.x = 1014 - textWidth; |
234 | 236 |
if (!contains(geometry, 'y')) geometry.y = 758 - (lines * 24) - 72; # 72 = offset from bottom to let softkeys display and margin |