@@ 53,7 53,7 @@
;on-frame .Screen/vector DEO2
( set defaults )
#0100 .frame/width STZ2
- #00c0 .frame/height STZ2
+ #00c8 .frame/height STZ2
#01 .settings/depth STZ
#01 .settings/color STZ
#81 .settings/blend STZ
@@ 63,25 63,25 @@
#0000 ;set-focus JSR2
( place )
.Screen/width DEI2 #01 SFT2 .frame/width LDZ2 #01 SFT2 SUB2 .Screen/height DEI2 #01 SFT2 .frame/height LDZ2 #01 SFT2 SUB2 .frame/width LDZ2 .frame/height LDZ2 ;frame ;set-size JSR2
- .frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #0030 ADD2 #007f #007f ;tileview ;set-size JSR2
- .frame/x1 LDZ2 #007f ADD2 .frame/y1 LDZ2 #0030 ADD2 #007f #007f ;nametable ;set-size JSR2
- .frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #001f #0028 ;zoomview ;set-size JSR2
- .frame/x1 LDZ2 #002f ADD2 .frame/y1 LDZ2 #0020 #0020 ;preview ;set-size JSR2
- .frame/x1 LDZ2 #005f ADD2 .frame/y1 LDZ2 #0020 #0020 ;colorview ;set-size JSR2
- .frame/x1 LDZ2 #008f ADD2 .frame/y1 LDZ2 #0020 #0028 ;blendview ;set-size JSR2
- .frame/x1 LDZ2 #00bf ADD2 .frame/y1 LDZ2 #0048 #0020 ;dataview ;set-size JSR2
+ .frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #0038 ADD2 #007f #007f ;tileview ;set-size JSR2
+ .frame/x1 LDZ2 #007f ADD2 .frame/y1 LDZ2 #0038 ADD2 #007f #007f ;nametable ;set-size JSR2
+ .frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #001f #002f ;zoomview ;set-size JSR2
+ .frame/x1 LDZ2 #002f ADD2 .frame/y1 LDZ2 #001f #002f ;preview ;set-size JSR2
+ .frame/x1 LDZ2 #005f ADD2 .frame/y1 LDZ2 #001f #002f ;colorview ;set-size JSR2
+ .frame/x1 LDZ2 #008f ADD2 .frame/y1 LDZ2 #001f #002f ;blendview ;set-size JSR2
+ .frame/x1 LDZ2 #00bf ADD2 .frame/y1 LDZ2 #0048 #002f ;dataview ;set-size JSR2
.tileview/x1 LDZ2 .tileview/y2 LDZ2 #0008 ADD2 #0100 #0008 ;toolview ;set-size JSR2
( static drawings )
;load-theme JSR2
- .frame/x1 LDZ2 #0009 SUB2 .frame/y1 LDZ2 #0028 ADD2 #20 #10 ;frame-icns ;draw-frame JSR2
+ .frame/x1 LDZ2 #0009 SUB2 .frame/y1 LDZ2 #0030 ADD2 #20 #10 ;frame-icns ;draw-frame JSR2
( spacers )
;spacer-icn .Screen/addr DEO2
.frame/x1 LDZ2 #007b ADD2 .Screen/x DEO2
- .frame/y1 LDZ2 #0028 ADD2 .Screen/y DEO2
+ .frame/y1 LDZ2 #0030 ADD2 .Screen/y DEO2
#01 .Screen/sprite DEO
;spacer-icn .Screen/addr DEO2
.frame/x1 LDZ2 #007b ADD2 .Screen/x DEO2
- .frame/y1 LDZ2 #00b0 ADD2 .Screen/y DEO2
+ .frame/y1 LDZ2 #00b8 ADD2 .Screen/y DEO2
#21 .Screen/sprite DEO
#00 .Screen/auto DEO
( let's begin! )
@@ 331,7 331,7 @@ BRK
@on-touch-zoomview ( -> )
- .Mouse/y DEI2 .zoomview/y1 LDZ2 SUB2 #03 SFT2 NIP #04 NEQ ;&no-mod JCN2
+ .Mouse/y DEI2 .zoomview/y1 LDZ2 SUB2 #0020 LTH2 ;&no-mod JCN2
.Mouse/x DEI2 .zoomview/x1 LDZ2 SUB2 #03 SFT2 NIP
DUP #00 EQU .Mouse/state DEI #01 EQU #0101 NEQ2 ,&no-su JCN ;op-shiftu ;run JSR2 &no-su
DUP #00 EQU .Mouse/state DEI #01 GTH #0101 NEQ2 ,&no-sd JCN ;op-shiftd ;run JSR2 &no-sd
@@ 354,7 354,7 @@ BRK
@on-touch-preview ( -> )
- ( y ) .Mouse/y DEI2 .preview/y1 LDZ2 SUB2 #03 SFT2 NIP
+ ( y ) .Mouse/y DEI2 .preview/y1 LDZ2 SUB2 #03 SFT2 NIP #03 AND
( x ) .Mouse/x DEI2 .preview/x1 LDZ2 SUB2 #03 SFT2 NIP
#40 SFT ADD #11 ADD .settings/ratio STZ
;draw-preview JSR2
@@ 836,7 836,7 @@ JMP2r
#00 .Screen/auto DEO
( label )
- .zoomview/y1 LDZ2 #0020 ADD2 .Screen/y DEO2
+ .zoomview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
.zoomview/x1 LDZ2 .Screen/x DEO2
;arrow-ver-icns .Screen/addr DEO2
#03 .Screen/sprite DEO
@@ 878,14 878,14 @@ JMP2r
( label )
.preview/x1 LDZ2 .Screen/x DEO2
- .preview/y2 LDZ2 INC2 .Screen/y DEO2
+ .preview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
.settings/ratio LDZ #03 ;draw-byte JSR2
JMP2r
@draw-colorview ( -- )
- .colorview/y2 LDZ2 INC2 .Screen/y DEO2
+ .colorview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
.colorview/x1 LDZ2 .Screen/x DEO2
.System/r ,&get-color JSR #03 ;draw-hex JSR2
.System/g ,&get-color JSR #03 ;draw-hex JSR2
@@ 930,19 930,17 @@ JMP2r
( label )
.blendview/x1 LDZ2 .Screen/x DEO2
- .blendview/y2 LDZ2 #0007 SUB2 .Screen/y DEO2
+ .blendview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
( get blending ) .settings/blend LDZ #03 ;draw-byte JSR2
( y )
.blendview/x1 LDZ2 #0010 ADD2 .Screen/x DEO2
- .blendview/y1 LDZ2 #0020 ADD2 .Screen/y DEO2
.settings/blend LDZ #20 AND #00 NEQ STH
;arrow-ver-icns #00 STHkr #30 SFT2 ADD2 .Screen/addr DEO2
#02 STHr SUB .Screen/sprite DEO
( x )
.blendview/x1 LDZ2 #0018 ADD2 .Screen/x DEO2
- .blendview/y1 LDZ2 #0020 ADD2 .Screen/y DEO2
.settings/blend LDZ #10 AND #00 NEQ STH
;arrow-hor-icns #00 STHkr #30 SFT2 ADD2 .Screen/addr DEO2
#02 STHr SUB .Screen/sprite DEO
@@ 953,7 951,7 @@ JMP2r
( position )
.dataview/x1 LDZ2 .Screen/x DEO2
- .dataview/y2 LDZ2 INC2 .Screen/y DEO2
+ .dataview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
.selection/a LDZ #03 ;draw-byte JSR2
.dataview/y1 LDZ2 .Screen/y DEO2
#0400