mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-28 11:17:46 +00:00
Minor IDE nuisances fixed (i).
- Fixes CTRL+letter being inserted in the text area even after combos were processed. - Fixes CTRL+letter activating menu items. - Fixes a menu being preselected when activated with ALT if the mouse was hovering it (hovering still works *after* the menu is launched)
This commit is contained in:
parent
3d01e8bcca
commit
0761c1f20f
1 changed files with 22 additions and 7 deletions
|
@ -3742,6 +3742,11 @@ FUNCTION ide2 (ignore)
|
||||||
|
|
||||||
IF K$ = CHR$(27) AND NOT AltSpecial THEN GOTO specialchar 'Steve edit 07-04-2014 to stop ESC from printing chr$(27) in the IDE
|
IF K$ = CHR$(27) AND NOT AltSpecial THEN GOTO specialchar 'Steve edit 07-04-2014 to stop ESC from printing chr$(27) in the IDE
|
||||||
|
|
||||||
|
'alt and ctrl combos have already been processed, so skip inserting
|
||||||
|
'K$ if these are still held down:
|
||||||
|
IF KCTRL THEN GOTO specialchar
|
||||||
|
IF KALT AND NOT AltSpecial THEN GOTO specialchar
|
||||||
|
|
||||||
'standard character
|
'standard character
|
||||||
IF ideselect THEN GOSUB delselect
|
IF ideselect THEN GOSUB delselect
|
||||||
idechangemade = 1
|
idechangemade = 1
|
||||||
|
@ -3821,6 +3826,7 @@ FUNCTION ide2 (ignore)
|
||||||
|
|
||||||
startmenu:
|
startmenu:
|
||||||
m = 1
|
m = 1
|
||||||
|
oldmx = mX: oldmy = mY
|
||||||
startmenu2:
|
startmenu2:
|
||||||
altheld = 1
|
altheld = 1
|
||||||
IF IdeSystem = 2 THEN IdeSystem = 1: GOSUB UpdateSearchBar
|
IF IdeSystem = 2 THEN IdeSystem = 1: GOSUB UpdateSearchBar
|
||||||
|
@ -3907,6 +3913,13 @@ FUNCTION ide2 (ignore)
|
||||||
LOOP UNTIL KB
|
LOOP UNTIL KB
|
||||||
|
|
||||||
K$ = UCASE$(K$)
|
K$ = UCASE$(K$)
|
||||||
|
IF LEN(K$) > 0 AND KCTRL THEN
|
||||||
|
'ctrl+key combos are not valid while a menu is active
|
||||||
|
LOCATE 1, 1: COLOR 0, 7: PRINT menubar$;
|
||||||
|
SCREEN , , 3, 0: PCOPY 3, 0
|
||||||
|
GOTO ideloop
|
||||||
|
END IF
|
||||||
|
|
||||||
FOR i = 1 TO menus
|
FOR i = 1 TO menus
|
||||||
a$ = UCASE$(LEFT$(menu$(i, 0), 1))
|
a$ = UCASE$(LEFT$(menu$(i, 0), 1))
|
||||||
IF K$ = a$ THEN
|
IF K$ = a$ THEN
|
||||||
|
@ -4196,13 +4209,15 @@ FUNCTION ide2 (ignore)
|
||||||
|
|
||||||
'with hotkey
|
'with hotkey
|
||||||
K$ = UCASE$(K$)
|
K$ = UCASE$(K$)
|
||||||
FOR r2 = 1 TO menusize(m)
|
IF LEN(K$) > 0 AND NOT KCTRL THEN
|
||||||
x = INSTR(menu$(m, r2), "#")
|
FOR r2 = 1 TO menusize(m)
|
||||||
IF x THEN
|
x = INSTR(menu$(m, r2), "#")
|
||||||
a$ = UCASE$(MID$(menu$(m, r2), x + 1, 1))
|
IF x THEN
|
||||||
IF K$ = a$ THEN s = r2: EXIT FOR
|
a$ = UCASE$(MID$(menu$(m, r2), x + 1, 1))
|
||||||
END IF
|
IF K$ = a$ THEN s = r2: EXIT FOR
|
||||||
NEXT
|
END IF
|
||||||
|
NEXT
|
||||||
|
END IF
|
||||||
|
|
||||||
IF s THEN
|
IF s THEN
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue