@@ 115,7 115,7 @@
( set defaults )
HOR TOS #0008 ** .frame/width STZ2
- VER TOS #0008 ** #0048 ++ .frame/height STZ2
+ VER TOS #0008 ** #0040 ++ .frame/height STZ2
#01 .settings/depth STZ
#01 .settings/color STZ
#01 .settings/blending STZ
@@ 128,7 128,7 @@
.frame/width LDZ2 .frame/height LDZ2
SIZE-TO-RECT ;frame SET-RECT
- .frame/x1 LDZ2 .frame/y1 LDZ2 #0038 ++ HOR TOS #0008 ** VER TOS #0008 ** SIZE-TO-RECT ;tileview SET-RECT
+ .frame/x1 LDZ2 .frame/y1 LDZ2 #0030 ++ HOR TOS #0008 ** VER TOS #0008 ** SIZE-TO-RECT ;tileview SET-RECT
.tileview/x1 LDZ2 .tileview/y2 LDZ2 #0008 ++ HOR TOS #0008 ** #0008 SIZE-TO-RECT ;toolview SET-RECT
.frame/x1 LDZ2 .frame/y1 LDZ2 #0020 #0020 SIZE-TO-RECT ;blendview SET-RECT
@@ 307,11 307,11 @@ BRK
DUP HOR SWP - #01 ! ,&no-save JCN
;save-file JSR2
&no-save
- DUP HOR SWP - #02 ! ,&no-load JCN
+ DUP HOR SWP - #03 ! ,&no-load JCN
;load-file JSR2
;redraw JSR22
&no-load
- DUP HOR SWP - #03 ! ,&no-name JCN
+ DUP HOR SWP - #04 ! ,&no-name JCN
#20 ;draw-filepath JSR2
;blank-txt ;new-file JSR2
;redraw JSR2
@@ 321,20 321,28 @@ BRK
;draw-tileview JSR2
;draw-toolview JSR2
&no-zoom
- DUP #08 > OVR HOR SWP - #04 > #0101 !! ,&no-rename JCN
+ DUP #08 > OVR HOR SWP - #05 > #0101 !! ,&no-rename JCN
.state/trap TOGGLE
#00 .state/blink STZ
#23 ;draw-filepath JSR2
&no-rename
+ DUP #01 + .settings/color LDZ ! ,&no-eraser JCN
+ #00 .settings/color STZ
+ ;draw-colorview JSR2
+ ;draw-toolview JSR2
+ POP RELEASE-MOUSE BRK
+ &no-eraser
DUP #02 > ,&no-color JCN
DUP #01 + .settings/color STZ
;draw-colorview JSR2
- ;draw-toolview JSR2 POP BRK
+ ;draw-toolview JSR2
+ POP RELEASE-MOUSE BRK
&no-color
DUP #06 > ,&no-tool JCN
DUP #03 = ,&end JCN
DUP #04 - .settings/tool STZ
- ;draw-toolview JSR2 POP BRK
+ ;draw-toolview JSR2
+ POP RELEASE-MOUSE BRK
&no-tool
POP
&end
@@ 426,7 434,8 @@ BRK
STHr #02 MOD STHk
#0f SWP [ #40 * SFT ] AND
STHr #00 =
- .Mouse/x DEI2 .colorview/x1 LDZ2 -- #0002 // TOB
+ .Mouse/x DEI2 .colorview/x1 LDZ2 -- #0002 // TOB
+ ( clamp to #0f ) DUP #10 = #01 * -
SWP [ #40 * SFT ] +
RTN
@@ 716,11 725,11 @@ RTN
.toolview/x2 LDZ2 #0008 -- .Screen/x DEO2
;save-icn .Screen/addr DEO2
#21 .Screen/color DEO
- .Screen/x DEI2 #0008 -- .Screen/x DEO2
+ .Screen/x DEI2 #0010 -- .Screen/x DEO2
;load-icn .Screen/addr DEO2
#21 .Screen/color DEO
.Screen/x DEI2 #0008 -- .Screen/x DEO2
- ;name-icn .Screen/addr DEO2
+ ;make-icn .Screen/addr DEO2
#21 .Screen/color DEO
( filepath )
@@ 1015,8 1024,8 @@ RTN
@opshift-icn 0010 387c fe10 1000
@oproll-icn 0008 0c0e 7f0e 0c08
-@name-icn 1054 28c6 2854 1000
-@save-icn fe82 8282 848a f400
+@save-icn 1054 28c6 2854 1000
+@make-icn fe82 8282 848a f400
@load-icn feaa d6aa d4aa f400
@untitled-txt "untitled.chr $1
