Minor cleanup

- Code cleanup
- Fixed mouse not working on checkboxes with no callback
This commit is contained in:
Quinn Dunki 2015-01-01 15:56:32 -08:00
parent 99095e297d
commit 6dc82fe5b5
5 changed files with 17 additions and 22 deletions

8
.gitignore vendored
View File

@ -1,13 +1,9 @@
/WeeGUI.xcodeproj/project.xcworkspace/xcuserdata/
/WeeGUI.xcodeproj/xcuserdata/
/gui.lst
/guidemo.lst
/gui
/guidemo
/guidemo.o
.DS_Store
mouse.lst

View File

@ -8,9 +8,10 @@ Known issues
- Mashing a button with mouse in Applesoft will cause Undefined Statement error
- Repainting a view while the mouse cursor is on it will cause artifacts when mouse moves
- Quitting sometimes leaves BASIC in inverted text mode
- Quitting with button highlighted leaves us in inverted text mode
To Do:
------
- Make WGFillRect support 1 height and 1 width
- If called in inverse mode, clear screen clears inverse

View File

@ -42,25 +42,28 @@ main:
bra @0
@1: jsr DOSCMD
jsr $7a00 ; HACK: Temp, until we figure out to BRUN from here
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Show off some WeeGUI features
;jmp tortureTestPrint
;jmp tortureTestRects
ldx #WGClearScreen
jsr WeeGUI
ldx #WGEnableMouse
jsr WeeGUI
ldx #WGDesktop
jsr WeeGUI
WGCALL16 WGCreateView,testView
WGCALL16 WGViewSetAction,testPaintContentsClick
; WGCALL16 WGViewSetTitle,testTitle0
; WGCALL16 WGCreateCheckbox,testCheck
; WGCALL16 WGCreateButton,testButton1
; WGCALL16 WGCreateButton,testButton2
WGCALL16 WGViewSetTitle,testTitle0
WGCALL16 WGCreateCheckbox,testCheck
WGCALL16 WGCreateButton,testButton1
WGCALL16 WGCreateButton,testButton2
ldx #WGViewPaintAll
jsr WeeGUI
@ -69,10 +72,7 @@ main:
ldx #WGSelectView
jsr WeeGUI
ldx #WGEnableMouse
jsr WeeGUI
jsr testPaintContents
; jsr testPaintContents
keyLoop:
ldx #WGPendingViewAction

View File

@ -78,8 +78,6 @@ WGDesktop_charLoop:
RESTORE_AXY
rts
WGTest:
rts
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; WGPlot

View File

@ -768,10 +768,10 @@ WGPendingViewAction:
beq WGPendingViewAction_done
WGPendingViewAction_chkCallback:
lda WG_VIEWRECORDS+10,y ; Optimization- only process things that can be clicked
bne WGPendingViewAction_hasCallback
lda WG_VIEWRECORDS+11,y
beq WGPendingViewAction_done
; lda WG_VIEWRECORDS+10,y ; Optimization- only process things that can be clicked
; bne WGPendingViewAction_hasCallback
; lda WG_VIEWRECORDS+11,y
; beq WGPendingViewAction_done
WGPendingViewAction_hasCallback:
lda WG_PENDINGACTIONVIEW