From 2b4a194df33ad73ad9f395540734c43283301813 Mon Sep 17 00:00:00 2001 From: Quinn Dunki Date: Sat, 7 Feb 2015 17:22:02 -0800 Subject: [PATCH] Polish - Improvements to BASIC sample code - Fixed button painting leaving text in inverse --- asmdemo.s | 2 +- views.s | 5 +++++ weegui.dsk | Bin 143360 -> 143360 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/asmdemo.s b/asmdemo.s index c1dc39b..def0b9f 100644 --- a/asmdemo.s +++ b/asmdemo.s @@ -47,7 +47,7 @@ main: ; Show off some WeeGUI features ;jmp tortureTestPrint - ;jmp tortureTestRects + jmp tortureTestRects ldx #WGClearScreen jsr WeeGUI diff --git a/views.s b/views.s index 5baa026..878727c 100644 --- a/views.s +++ b/views.s @@ -377,6 +377,9 @@ paintCheck_done: ; Y: Index into view records of button to paint ; Side effects: Clobbers all registers,P0,P1,S1 paintButton: + lda INVERSE ; Preserve INVERSE state during this + pha + lda WG_VIEWRECORDS+12,y ; Prep the title string sta PARAM0 lda WG_VIEWRECORDS+13,y @@ -438,6 +441,8 @@ paintButton_titleMarginRightLoop: jmp paintButton_titleMarginRightLoop paintButton_done: + pla ; Restore inverse state + sta INVERSE rts diff --git a/weegui.dsk b/weegui.dsk index f67fd171fbaaeea6a9907bd0a4f8d6a1ac0accc4..c29022c22021186923dce6401660d49e6a90c93d 100644 GIT binary patch delta 5501 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 F_&?qi