From 25bde6bc2cb7ec67900384dc24b6acffb04dfbea Mon Sep 17 00:00:00 2001 From: 4am Date: Sun, 1 Apr 2018 22:24:13 -0400 Subject: [PATCH] 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