a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mouse Wheel switch for the GUI

Browse Source
This commit is contained in:
zsknight
2001-05-16 22:38:20 +00:00
parent 83bd5ab24e
commit 4dda944d7d
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zsnes/src/gui/gui.asm
View File

@@ -580,6 +580,8 @@ NEWSYM GUIWBAdd, db 25
NEWSYM BlackAndWhite, db 0
NEWSYM MouseWheel, db 0
GUIsave equ $-GUIRAdd
NEWSYM CombinDataGlob, times 3300 db 0 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff
@@ -598,7 +600,7 @@ ModemOKStat db 0 ; OK is detected on modem status
; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO
GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,65 ,5 ,30 ,20 ,10 ,80 ,65 ,20 ,70 ,50 ,3 ,50
GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,36 ,20 ,30 ,20 ,20 ,50 ,60 ,30 ,65 ,50 ,22 ,60
GUIwinsizex dd 0,244 ,126 ,189 ,167 ,170 ,148 ,244 ,8*16,13*16,180 ,7*16,9*16,8*16,9*16,140 ,250 ,160
GUIwinsizex dd 0,244 ,126 ,189 ,167 ,170 ,148 ,244 ,8*16,13*16,220 ,7*16,9*16,8*16,9*16,140 ,250 ,160
GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,168 ,191 ,40 ,189 ,182 ,98 ,42 ,40 ,42 ,70 ,190 ,60
GUIwinptr db 0
@@ -1522,8 +1524,8 @@ NEWSYM StartGUI
; cmp byte[OSPort],3
; jne .nowinport
%ifndef __MSDOS__
mov dword[GUIGUIOptnsText8+12],' GUI'
mov byte[GUIGUIOptnsText8+16],0
; mov dword[GUIGUIOptnsText8+12],' GUI'
; mov byte[GUIGUIOptnsText8+16],0
%endif
;.nowinport
cmp byte[OldWinPos],0

2
zsnes/src/gui/guimouse.inc
View File

@@ -2626,6 +2626,8 @@ DisplayGUIOptnsClick:
GUIClickCButton 12,73,byte[JoyPad1Move]
GUIClickCButton6 12,83,byte[GUIEffect],1
GUIClickCButton6 12,93,byte[GUIEffect],2
GUIClickCButton 124,23,byte[MouseWheel]
%ifdef __WIN32__
GUIClickCButton 12,168,byte[AlwaysOnTop]
GUIClickCButton 12,178,byte[SaveMainWindowPos]

23
zsnes/src/gui/guiwindp.inc
View File

@@ -4674,6 +4674,14 @@ DisplayGUIOptns:
mov dword[GUITemp],22
add [GUITemp],eax
GUIDisplayIconWin 10,[GUITemp],144,GUIIconDataSlideBar
mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[MouseWheel],1
jne .nocheckr
mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckr
GUIDisplayIconWin 10,124,23,[GUITemp]
mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[mousewrap],1
jne .nocheck
@@ -4765,6 +4773,7 @@ DisplayGUIOptns:
GUIOuttextwin2u 10,26,58,GUIGUIOptnsText7,5
GUIOuttextwin2u 10,26,68,GUIGUIOptnsText8,0
GUIOuttextwin2u 10,26,78,GUIGUIOptnsTextA,0
GUIOuttextwin2 10,138,28,GUIGUIOptnsTextJ
GUIOuttextwin2 10,60,111,GUIGUIOptnsTextG
GUIOuttextwin2 10,100,111,GUIGUIOptnsTextH
GUIOuttextwin2 10,147,111,GUIGUIOptnsTextI
@@ -4787,6 +4796,7 @@ DisplayGUIOptns:
GUIOuttextwin2 10,25,57,GUIGUIOptnsText7
GUIOuttextwin2 10,25,67,GUIGUIOptnsText8
GUIOuttextwin2 10,25,77,GUIGUIOptnsTextA
GUIOuttextwin2 10,137,27,GUIGUIOptnsTextJ
GUIOuttextwin2 10,59,110,GUIGUIOptnsTextG
GUIOuttextwin2 10,99,110,GUIGUIOptnsTextH
GUIOuttextwin2 10,146,110,GUIGUIOptnsTextI
@@ -4870,21 +4880,22 @@ DisplayGUIOptns:
GUIGUIOptnsText1 db 'COLOR:',0
GUIGUIOptnsText2 db 'MOUSE WRAP',0
GUIGUIOptnsText3 db 'MOUSE SHADOW',0
GUIGUIOptnsText4 db 'KEEP MENU POSITION',0
GUIGUIOptnsText4 db 'KEEP MENU POSITN',0
GUIGUIOptnsText5 db 'GUI SWITCHES :',0
GUIGUIOptnsText6 db '@',0
GUIGUIOptnsText7 db 'SAVE GUI WINDOW POSITIONS',0
GUIGUIOptnsText8 db 'CLICK ENTERS/EXITS GUI',0
GUIGUIOptnsText7 db 'SAVE WIN POSITNS',0
GUIGUIOptnsText8 db 'CLICK ENTERS GUI',0
GUIGUIOptnsText9 dd 0
GUIGUIOptnsTextA db 'USE JOYPAD1 TO CONTROL',0
GUIGUIOptnsTextB dd 'ENABLE SNOW EFFECT',0
GUIGUIOptnsTextC dd 'ENABLE WATER EFFECT',0
GUIGUIOptnsTextA db 'USE JOYPAD1',0
GUIGUIOptnsTextB dd 'SNOW EFFECT',0
GUIGUIOptnsTextC dd 'WATER EFFECT',0
GUIGUIOptnsTextD dd 'MAIN WINDOW OPTIONS :',0
GUIGUIOptnsTextE dd 'ALWAYS ON TOP',0
GUIGUIOptnsTextF db 'SAVE MAIN WINDOW POSITION',0
GUIGUIOptnsTextG db 'BACK',0
GUIGUIOptnsTextH db 'TITLE',0
GUIGUIOptnsTextI db 'WIN',0
GUIGUIOptnsTextJ db 'WHEEL MOUSE',0
DisplayGUIAbout:
; cmp byte[OSPort],3