more bugfixes and refactoring around repainting

src/WeeGUI_MLI.s

@@ -73,8 +73,9 @@ WGSetContentWidth		= 78
 WGSetContentHeight		= 80
 WGStrokeRoundRect		= 82
 WGCreateRadio			= 84
-WGReset					= 86
+WGResetAll				= 86
 WGGetState				= 88
 WGPendingClick			= 90
 WGClearPendingClick		= 92
+WGResetView				= 94
 

src/ui.main.a

@@ -40,7 +40,7 @@ gViewInUse
 ;------------------------------------------------------------------------------
 !zone {
 PaintMain
-         ldx   #WGReset
+         ldx   #WGResetAll
          jsr   WeeGUI
          stz   gViewInUse+ID_BOXART
          stz   gViewInUse+ID_HINTS
@@ -95,6 +95,7 @@ RepaintMainIfDirty
 
          ldx   #WGClearScreen        ; clear screen
          jsr   WeeGUI
+
          jsr   PaintTitleBar         ; paint top bar
 
          lda   #4                    ; paint horizontal separator bar
@@ -110,25 +111,33 @@ RepaintMainIfDirty
          bne   -
          ldx   #WGSyncGlobalCursor
          jsr   WeeGUI
-
 .nohome
-         lda   #ID_INFO
+         ldx   #WGSelectView         ; delete info box but leave its contents on screen
-         jsr   WGResetView
+         lda   #ID_INFO              ; (harmless if it doesn't exist yet)
+         jsr   WeeGUI
+         ldx   #WGResetView
+         jsr   WeeGUI
 
-         lda   #ID_DESCRIPTION
+         ldx   #WGSelectView         ; delete description box but leave its contents on screen
-         jsr   WGResetView
+         lda   #ID_DESCRIPTION       ; (harmless if it doesn't exist yet)
+         jsr   WeeGUI
+         ldx   #WGResetView
+         jsr   WeeGUI
+
+         ldx   #WGSelectView         ; WeeGUI does NOT like repainting if the selected view does not exist
+         lda   #ID_PREVIOUS
+         jsr   WeeGUI
 
          ldx   #WGViewPaintAll       ; repaint all WeeGUI-controlled UI elements
          jsr   WeeGUI
 
-         ldx   #WGCreateView         ; create borderless frame for game title and info
+         ldx   #WGCreateView         ; (re)create borderless frame for game title and info
-         +LDADDR kViewInfo
+         +LDADDR kViewInfo           ; (has the nice side effect of resetting the scroll)
          +STAY PARAM0
          jsr   WeeGUI
+         jsr   PaintInfoView         ; paint contents of info box
 
-         jsr   PaintInfoView         ; paint info box manually
+         ldx   #WGCreateView         ; (re)create scrollable frame for game description text
-
-         ldx   #WGCreateView         ; create scrollable frame for game description text
          +LDADDR kViewDescription
          +STAY PARAM0
          jsr   WeeGUI
@@ -136,32 +145,11 @@ RepaintMainIfDirty
          +LDADDR PaintDescriptionView
          +STAY PARAM0
          jsr   WeeGUI
-
+         ldx   #WGPaintView          ; paint frame of description box
-         ldx   #WGSelectView         ; reset scrolling of description box
-         lda   #ID_DESCRIPTION
          jsr   WeeGUI
-         ldx   #WGScrollX
+         jmp   PaintDescriptionView  ; paint contents of description box
-         lda   #0
-         jsr   WeeGUI
-         ldx   #WGScrollY
-         lda   #0
-         jsr   WeeGUI
-         ldx   #WGPaintView
-         jsr   WeeGUI
-         jmp   PaintDescriptionView  ; paint description box manually
 }
 
-WGResetView
-WG_VIEWRECORDS=$59B5
-         asl
-         asl
-         asl
-         asl
-         tay
-         lda   #0
-         sta   WG_VIEWRECORDS+2,y
-         rts
-
 ;------------------------------------------------------------------------------
 ; CreateOrDestroyButton
 ; create or destroy a WeeGUI Button view, based on per-game options
@@ -224,8 +212,8 @@ CreateOrDestroyButton
          jsr   WeeGUI
          ldx   #WGEraseView
          jsr   WeeGUI
-         lda   .viewID
+         ldx   #WGResetView
-         jsr   WGResetView
+         jsr   WeeGUI
 
 .done    rts
 }

src/ui.options.a

@@ -46,7 +46,7 @@ ID_OPTIONS_CANCEL         = 7
 OptionsDialog
          ldx   #$FF
          txs
-         ldx   #WGReset              ; reset WeeGUI
+         ldx   #WGResetAll           ; reset WeeGUI, destroy all views
          jsr   WeeGUI
 
          ldx   #WGCreateView         ; create frame