Merge branch 'main' into 29-vivoactive-4s-crashes-user-reported-error

This commit is contained in:
Philip Abbey
2023-12-17 11:57:24 +00:00
43 changed files with 421 additions and 85 deletions

View File

@ -78,11 +78,10 @@ class ErrorView extends ScalableView {
function onUpdate(dc as Graphics.Dc) as Void {
var w = dc.getWidth();
var hw = w/2;
var bg = 0x3B444C;
if(dc has :setAntiAlias) {
dc.setAntiAlias(true);
}
dc.setColor(Graphics.COLOR_WHITE, bg);
dc.setColor(Graphics.COLOR_WHITE, Graphics.COLOR_BLUE);
dc.clear();
dc.drawBitmap(hw - mErrorIcon.getWidth()/2, mErrorIconMargin, mErrorIcon);
mTextArea.draw(dc);
@ -143,4 +142,4 @@ class ErrorDelegate extends WatchUi.BehaviorDelegate {
return true;
}
}
}