QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-01 13:50:36 +00:00
Code Issues Releases Wiki Activity

Fix contextual menu return actions (DebugMode)

Browse source
This commit is contained in:
FellippeHeitor 2021-10-03 20:09:18 -03:00
parent b85d128faa
commit f175fd2846
1 changed files with 49 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/ide/ide_methods.bas
View file

@ -759,6 +759,7 @@ FUNCTION ide2 (ignore)
GOSUB redrawItAll GOSUB redrawItAll
GOTO ExitDebugMode 'IdeDebugMode must be 0 here, if not, DebugMode errored. GOTO ExitDebugMode 'IdeDebugMode must be 0 here, if not, DebugMode errored.
END IF END IF
IF c$ = CHR$(254) THEN IF c$ = CHR$(254) THEN
'$DEBUG mode on '$DEBUG mode on
IdeDebugMode = 1 IdeDebugMode = 1
@ -5768,6 +5769,10 @@ FUNCTION ide2 (ignore)
END IF END IF
IF menu$(m, s) = "#Watch List... F4" THEN IF menu$(m, s) = "#Watch List... F4" THEN
IF IdeDebugMode = 2 THEN
IdeDebugMode = 16
GOTO EnterDebugMode
ELSE
PCOPY 2, 0 PCOPY 2, 0
showWatchList: showWatchList:
IF vWatchOn = 0 THEN IF vWatchOn = 0 THEN
@ -5809,6 +5814,7 @@ FUNCTION ide2 (ignore)
PCOPY 3, 0: SCREEN , , 3, 0 PCOPY 3, 0: SCREEN , , 3, 0
GOTO ideloop GOTO ideloop
END IF END IF
END IF
IF menu$(m, s) = "Call #Stack... F12" OR menu$(m, s) = "Call Stack... F12" THEN IF menu$(m, s) = "Call #Stack... F12" OR menu$(m, s) = "Call Stack... F12" THEN
IF IdeDebugMode = 2 THEN IF IdeDebugMode = 2 THEN
@ -6440,6 +6446,10 @@ SUB DebugMode
SCREEN , , 3, 0 SCREEN , , 3, 0
COLOR 15, 3: _PRINTSTRING (1, 1), SPACE$(LEN(menubar$))
m$ = "$DEBUG MODE ACTIVE"
_PRINTSTRING ((idewx - LEN(m$)) \ 2, 1), m$
TYPE vWatchPanelType TYPE vWatchPanelType
AS INTEGER x, y, w, h, firstVisible, hPos, vBarThumb, hBarThumb AS INTEGER x, y, w, h, firstVisible, hPos, vBarThumb, hBarThumb
AS INTEGER draggingVBar, draggingHBar, mX, mY AS INTEGER draggingVBar, draggingHBar, mX, mY
@ -6509,7 +6519,7 @@ SUB DebugMode
CASE 4: IdeDebugMode = 1: GOTO requestContinue CASE 4: IdeDebugMode = 1: GOTO requestContinue
CASE 5: IdeDebugMode = 1: GOTO requestStepOut CASE 5: IdeDebugMode = 1: GOTO requestStepOut
CASE 6: IdeDebugMode = 1: GOTO requestStepOver CASE 6: IdeDebugMode = 1: GOTO requestStepOver
CASE 7: IdeDebugMode = 1: GOTO requestPause CASE 7: IdeDebugMode = 1: GOTO requestStepInto
CASE 8 CASE 8
IdeDebugMode = 1 IdeDebugMode = 1
result = idecy result = idecy
@ -6527,12 +6537,9 @@ SUB DebugMode
GOTO requestSetNextLine GOTO requestSetNextLine
CASE 14: IdeDebugMode = 1: GOTO requestSubsDialog CASE 14: IdeDebugMode = 1: GOTO requestSubsDialog
CASE 15: IdeDebugMode = 1: GOTO requestUnskipAllLines CASE 15: IdeDebugMode = 1: GOTO requestUnskipAllLines
CASE 16: IdeDebugMode = 1: GOTO requestVariableWatch
END SELECT END SELECT
COLOR 15, 3: _PRINTSTRING (1, 1), SPACE$(LEN(menubar$))
m$ = "$DEBUG MODE ACTIVE"
_PRINTSTRING ((idewx - LEN(m$)) \ 2, 1), m$
dummy = DarkenFGBG(1) dummy = DarkenFGBG(1)
clearStatusWindow 0 clearStatusWindow 0
setStatusMessage 1, "Entering $DEBUG mode (ESC to abort)...", 15 setStatusMessage 1, "Entering $DEBUG mode (ESC to abort)...", 15
@ -7422,6 +7429,7 @@ SUB DebugMode
END IF END IF
CASE 16640 'F7 CASE 16640 'F7
F7: F7:
requestStepInto:
IF PauseMode = 0 THEN IF PauseMode = 0 THEN
cmd$ = "break" cmd$ = "break"
PauseMode = -1 PauseMode = -1