From b8ca8dd6d48e7ec4b48e9c44385c173f0d9a71c8 Mon Sep 17 00:00:00 2001 From: 4am Date: Mon, 26 Mar 2018 19:35:55 -0400 Subject: [PATCH 1/7] add WGGetState --- Documentation.md | 15 ++++++++++++++- WeeGUI_MLI.s | 1 + views.s | 21 +++++++++++++++++++++ weegui.dsk | Bin 143360 -> 143360 bytes weegui.s | 2 ++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Documentation.md b/Documentation.md index 3da9904..b10a5be 100644 --- a/Documentation.md +++ b/Documentation.md @@ -734,13 +734,26 @@ Sets the currently selected view's value. For progress bar views, this is the pr
AssemblyApplesoft
 X:		WGSetState
-A: 		new value
+PARAM0: new value
 
&SETV(value)
+####WGGetState +Gets the currently selected view's value. For progress bar views, this is the progress value. For checkboxes and radio buttons, 1 is checked and 0 is unchecked. + + + +
AssemblyApplesoft
+X:		WGGetState
+On exit, the value is in PARAM0
+
+Not available +
+ + ####WGViewSetRawTitle Sets the currently selected view's title to be rendered in raw bytes (or not). This allows some advanced tricks with using Mousetext and mixed inversion in view titles. diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index fc614fc..543d8f4 100644 --- a/WeeGUI_MLI.s +++ b/WeeGUI_MLI.s @@ -74,4 +74,5 @@ WGSetContentHeight = 80 WGStrokeRoundRect = 82 WGCreateRadio = 84 WGReset = 86 +WGGetState = 88 diff --git a/views.s b/views.s index 9c3daf4..30c8b53 100644 --- a/views.s +++ b/views.s @@ -270,6 +270,27 @@ WGSetState_done: +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; WGGetState +; Gets state field in view record +; on exit, PARAM0 contains the state value, stripped of the high +; bit +; +WGGetState: + SAVE_AY + + LDY_ACTIVEVIEW + + lda WG_VIEWRECORDS+9,y + and #%01111111 + sta PARAM0 + +WGGetState_done: + RESTORE_AY + rts + + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WGCreateButton ; Creates a new button diff --git a/weegui.dsk b/weegui.dsk index 92372117f4c2865d4eea65b857448c0927cdea9a..94b7cdc14c88c69e79966ff0139adb5713909c17 100644 GIT binary patch delta 5864 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 E4^LW=VgLXD delta 5874 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 n;9u7Kbq4%3gvE0>eFgqWJcq?! Date: Sat, 31 Mar 2018 11:28:27 -0400 Subject: [PATCH 2/7] add WGPendingClick to MLI --- WeeGUI_MLI.s | 1 + weegui.dsk | Bin 143360 -> 143360 bytes 2 files changed, 1 insertion(+) diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index 543d8f4..3481ad9 100644 --- a/WeeGUI_MLI.s +++ b/WeeGUI_MLI.s @@ -75,4 +75,5 @@ WGStrokeRoundRect = 82 WGCreateRadio = 84 WGReset = 86 WGGetState = 88 +WGPendingClick = 90 diff --git a/weegui.dsk b/weegui.dsk index 94b7cdc14c88c69e79966ff0139adb5713909c17..54ccf1c3fa9591b4ab935ea2ca1b1f9c2839f23f 100644 GIT binary patch delta 75 zcmZp8z|ru4V?!3VNxcduHv_|Ch6E6Ui9s#g)zv-J)1Ltf*mM~98E#86z?3%^1 delta 75 zcmZp8z|ru4V?!3VNtKGQFayJ5h6E6Ui9s#g)zv-J)1Ltf*mM~98E#86z?3 Date: Sat, 31 Mar 2018 11:32:17 -0400 Subject: [PATCH 3/7] actually add WGPendingClick --- weegui.dsk | Bin 143360 -> 143360 bytes weegui.s | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/weegui.dsk b/weegui.dsk index 54ccf1c3fa9591b4ab935ea2ca1b1f9c2839f23f..b858c3f908bf95f31d9cb66d07ea1668a3422456 100644 GIT binary patch delta 5487 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 delta 5508 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 bo&NX4_^osf#QFCJho_7`KXB-P;TQi8v;+v) diff --git a/weegui.s b/weegui.s index 386d7bd..c37252b 100644 --- a/weegui.s +++ b/weegui.s @@ -78,7 +78,7 @@ WGEntryPointTable: .addr WGCreateRadio .addr WGReset .addr WGGetState - +.addr WGPendingClick ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From 39f6a9106a6d3738850f4ac717894fa84a536949 Mon Sep 17 00:00:00 2001 From: 4am Date: Sat, 31 Mar 2018 11:49:58 -0400 Subject: [PATCH 4/7] add WGClearPendingClick --- Documentation.md | 12 ++++++++++++ WeeGUI_MLI.s | 1 + views.s | 10 ++++++++++ weegui.dsk | Bin 143360 -> 143360 bytes weegui.s | 1 + 5 files changed, 24 insertions(+) diff --git a/Documentation.md b/Documentation.md index 754bf61..f16949c 100644 --- a/Documentation.md +++ b/Documentation.md @@ -565,6 +565,18 @@ Not available +####WGClearPendingClick +Clear the currently pending click, if any. Most programs shouldn't need this, but you can use it to do your own low-level click handling if you wish. + + + +
AssemblyApplesoft
+X:		WGClearPendingClick
+
+Not available +
+ + ####WGViewFocus Focus is shifted to the currently selected view. This will highlight the view visually, as needed, and any affected views are redrawn as needed. diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index 3481ad9..60b95e7 100644 --- a/WeeGUI_MLI.s +++ b/WeeGUI_MLI.s @@ -76,4 +76,5 @@ WGCreateRadio = 84 WGReset = 86 WGGetState = 88 WGPendingClick = 90 +WGClearPendingClick = 92 diff --git a/views.s b/views.s index 30c8b53..6ef80a5 100644 --- a/views.s +++ b/views.s @@ -1185,6 +1185,16 @@ WGPendingClick_done: rts +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; WGClearPendingClick +; clear mouse coordinates +; +WGClearPendingClick: + stz WG_MOUSECLICK_X + dec WG_MOUSECLICK_X + rts + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WGViewSetTitle ; Sets the title of the active view diff --git a/weegui.dsk b/weegui.dsk index b858c3f908bf95f31d9cb66d07ea1668a3422456..47f4c9465543b1ba9c63e6780bb177386394fd40 100644 GIT binary patch delta 5506 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 ay=cJ|-5)u%n4o_=G_8O6M}0ri9sGZw%pxiP delta 5468 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 diff --git a/weegui.s b/weegui.s index c37252b..05cffba 100644 --- a/weegui.s +++ b/weegui.s @@ -79,6 +79,7 @@ WGEntryPointTable: .addr WGReset .addr WGGetState .addr WGPendingClick +.addr WGClearPendingClick ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From 25bde6bc2cb7ec67900384dc24b6acffb04dfbea Mon Sep 17 00:00:00 2001 From: 4am Date: Sun, 1 Apr 2018 22:24:13 -0400 Subject: [PATCH 5/7] add WGResetView --- Documentation.md | 12 ++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ WeeGUI_MLI.s | 3 ++- views.s | 12 ++++++++++++ weegui.dsk | Bin 143360 -> 143360 bytes weegui.s | 12 ++++++------ 6 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 WeeGUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Documentation.md b/Documentation.md index f16949c..fdeb1ab 100644 --- a/Documentation.md +++ b/Documentation.md @@ -1158,6 +1158,18 @@ Not available +####WGResetView +Deletes the selected view but does not erase or repaint anything. The ID is now available for use by a new view. + + + +
AssemblyApplesoft
+X:		WGResetView
+
+Not available
+
+ +

- - - diff --git a/WeeGUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WeeGUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/WeeGUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index 60b95e7..86ce176 100644 --- a/WeeGUI_MLI.s +++ b/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 diff --git a/views.s b/views.s index 6ef80a5..6dfeb5f 100644 --- a/views.s +++ b/views.s @@ -388,6 +388,18 @@ WGDeleteView_done: +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; WGResetView +; Deletes the current view but does not erase or repaint anything +; +WGResetView: + SAVE_AX + LDX_ACTIVEVIEW + stz WG_VIEWRECORDS+2,x + + RESTORE_AX + rts + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WGPaintView ; Paints the current view diff --git a/weegui.dsk b/weegui.dsk index 47f4c9465543b1ba9c63e6780bb177386394fd40..f2f151631d32480d933a33f0045e95183494c724 100644 GIT binary patch delta 5488 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 Go&OIY%o`N| diff --git a/weegui.s b/weegui.s index 05cffba..448de79 100644 --- a/weegui.s +++ b/weegui.s @@ -76,11 +76,11 @@ WGEntryPointTable: .addr WGSetContentHeight .addr WGStrokeRoundRect .addr WGCreateRadio -.addr WGReset +.addr WGResetAll .addr WGGetState .addr WGPendingClick .addr WGClearPendingClick - +.addr WGResetView ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WGInit @@ -100,16 +100,16 @@ WGInit: RESTORE_AXY - jmp WGReset + jmp WGResetAll ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; WGReset -; Reset views and strings. Called from WGInit during app startup. +; WGResetAll +; Reset all views and strings. Called from WGInit during app startup. ; Can also be called at any time to "start over" with no views. ; (Does not clear screen or repaint.) ; -WGReset: +WGResetAll: SAVE_AXY ldy #15 ; Clear our block allocators From 294b9502e88f17ad5878efefc1d3d8e8c1761d90 Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 10 Apr 2018 12:54:17 -0400 Subject: [PATCH 6/7] fix some minor documentation typos and formatting --- Documentation.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.md b/Documentation.md index fdeb1ab..9184554 100644 --- a/Documentation.md +++ b/Documentation.md @@ -436,9 +436,9 @@ PARAM1: Pointer to configuration block (MSB) Configuration block consists of five bytes: 0: View ID (0-15) -1: X position of checkbox -2: Y position of checkbox -3: Pointer to null-terminated string label (LSB) +1: X position of radio button +2: Y position of radio button +3: Pointer to null-terminated string label (LSB) 4: Pointer to null-terminated string label (MSB)
 &RADIO(    View ID,

From c95837c15b99f0ed85898b06917a7888bc5df6bd Mon Sep 17 00:00:00 2001
From: 4am 
Date: Wed, 11 Apr 2018 19:14:27 -0400
Subject: [PATCH 7/7] always set state of activated radio button to 1

---
 views.s    |   7 +++++--
 weegui.dsk | Bin 143360 -> 143360 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/views.s b/views.s
index 6dfeb5f..0a0bef2 100644
--- a/views.s
+++ b/views.s
@@ -1028,11 +1028,14 @@ WGViewFocusAction_toggleRadioLoopNext:
 	dec
 	bpl WGViewFocusAction_toggleRadioLoop
 	LDY_FOCUSVIEW
-	; execution falls through here
+	lda WG_VIEWRECORDS+9,y		; Set the radio button's state and redraw
+	ora #%00000001
+	bra WGViewFocusAction_setStateAndRedraw
 
 WGViewFocusAction_toggleCheckbox:
-	lda WG_VIEWRECORDS+9,y		; Change the checkbox's state and redraw
+	lda WG_VIEWRECORDS+9,y		; Toggle the checkbox's state and redraw
 	eor #%00000001
+WGViewFocusAction_setStateAndRedraw:
 	sta WG_VIEWRECORDS+9,y
 	lda WG_FOCUSVIEW
 	jsr WGSelectView
diff --git a/weegui.dsk b/weegui.dsk
index f2f151631d32480d933a33f0045e95183494c724..9563c883913a0288ed2f912754b20c36807f886a 100644
GIT binary patch
delta 4959
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

delta 4990
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
H={Nria2r|d