Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-02-09 04:30:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix min/max cont width/length, misc other tidying

Browse Source
This commit is contained in:
Joshua Bell 2018-05-13 22:20:46 -07:00
parent 37ff19ef0d
commit 90bfbb8310
6 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MGTK.md
View File

@ -431,8 +431,8 @@ Menu record:
.byte status
.byte reserved
.word mincontwidth minimum content size (horizontal)
.word maxcontwidth maximum content size (horizontal)
.word mincontlength minimum content size (vertical)
.word maxcontwidth maximum content size (horizontal)
.word maxcontlength maximum content size (vertical)
GrafPort windowport GrafPort record
.addr nextwinfo address of next lower window in stack

8
desk.acc/date.s
View File

@ -233,14 +233,14 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 100
maxcontwidth: .word 100
mincontlength: .word $1F4
maxcontlength: .word $1F4
mincontlength: .word 100
maxcontwidth: .word 500
maxcontlength: .word 500
port:
viewloc: DEFINE_POINT 180, 50
mapbits: .addr MGTK::screen_mapbits
mapwidth: .word MGTK::screen_mapwidth
cliprect: DEFINE_RECT 0, 0, $C7, $40
cliprect: DEFINE_RECT 0, 0, 199, 64
pattern:.res 8,$00
colormasks: .byte MGTK::colormask_and, MGTK::colormask_or
penloc: DEFINE_POINT 0, 0

11
desktop.inc
View File

@ -112,6 +112,16 @@ DESKTOP_RELAY := $D040
.endif
.endmacro
;;; ============================================================
;;; Internals
;;; Set to specific machine type; used for insertion point blinking
;;; and double-click timing.
;;; //e - $96
;;; //c - $FA
;;; IIgs - $FD
machine_speed := $D2AB
;;; ============================================================
;;; Internals - Windows (paths) and Icons (files)
@ -205,6 +215,7 @@ DEFAULT_FONT := $8800
GLYPH_FOLDERL := $01
GLYPH_FOLDERR := $02
GLYPH_SPC := $00
GLYPH_INSPT := $06
GLYPH_LARROW := $09

26
desktop/desktop_res.s
View File

@ -358,8 +358,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 150
maxcontwidth: .word 50
mincontlength: .word 500
mincontlength: .word 50
maxcontwidth: .word 500
maxcontlength: .word 140
port:
viewloc: DEFINE_POINT 75, 35
@ -392,8 +392,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 150
maxcontwidth: .word 50
mincontlength: .word 500
mincontlength: .word 50
maxcontwidth: .word 500
maxcontlength: .word 140
port:
viewloc: DEFINE_POINT 25, 20
@ -426,8 +426,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 100
maxcontwidth: .word 70
mincontlength: .word 100
mincontlength: .word 70
maxcontwidth: .word 100
maxcontlength: .word 70
port:
viewloc: DEFINE_POINT 53, 50
@ -462,8 +462,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 150
maxcontwidth: .word 50
mincontlength: .word 500
mincontlength: .word 50
maxcontwidth: .word 500
maxcontlength: .word 140
port:
viewloc: DEFINE_POINT (screen_width - width) / 2, 40
@ -499,8 +499,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 150
maxcontwidth: .word 50
mincontlength: .word 500
mincontlength: .word 50
maxcontwidth: .word 500
maxcontlength: .word 140
port:
viewloc: DEFINE_POINT (screen_width - width) / 2, 25
@ -686,7 +686,7 @@ pos_D90B:
rect_D90F:
DEFINE_RECT 0,0,125,0
pos_D917:
picker_entry_pos:
DEFINE_POINT 2,0
.byte $00,$00
@ -1181,8 +1181,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 170
maxcontwidth: .word 50
mincontlength: .word 545
mincontlength: .word 50
maxcontwidth: .word 545
maxcontlength: .word 175
port:
viewloc: DEFINE_POINT 20, 27

8
desktop/ovl1b.s
View File

@ -217,8 +217,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 150
maxcontwidth: .word 50
mincontlength: .word 500
mincontlength: .word 50
maxcontwidth: .word 500
maxcontlength: .word 140
port:
viewloc: DEFINE_POINT 25, 20
@ -249,8 +249,8 @@ vthumbpos: .byte 0
status: .byte 0
reserved: .byte 0
mincontwidth: .word 100
maxcontwidth: .word 50
mincontlength: .word 150
mincontlength: .word 50
maxcontwidth: .word 150
maxcontlength: .word 150
port:
viewloc: DEFINE_POINT 45, 50

16
desktop/ovl4.s
View File

@ -1520,11 +1520,11 @@ L606D: lda winfo_entrydlg_file_picker
jsr L62C8
MGTK_RELAY_CALL MGTK::PaintRect, winfo_entrydlg_file_picker_cliprect
lda #$10
sta pos_D917
sta picker_entry_pos
lda #$08
sta pos_D917+2
sta picker_entry_pos+2
lda #$00
sta pos_D917+3
sta picker_entry_pos+3
sta L6128
L608E: lda L6128
cmp $177F
@ -1533,7 +1533,7 @@ L608E: lda L6128
MGTK_RELAY_CALL MGTK::SetPort, grafport3
rts
L60A9: MGTK_RELAY_CALL MGTK::MoveTo, pos_D917
L60A9: MGTK_RELAY_CALL MGTK::MoveTo, picker_entry_pos
ldx L6128
lda $1780,x
and #$7F
@ -1559,11 +1559,11 @@ L60A9: MGTK_RELAY_CALL MGTK::MoveTo, pos_D917
lda $1780,x
bpl L60FF
lda #$01
sta pos_D917
MGTK_RELAY_CALL MGTK::MoveTo, pos_D917
sta picker_entry_pos
MGTK_RELAY_CALL MGTK::MoveTo, picker_entry_pos
addr_call draw_string, str_folder
lda #$10
sta pos_D917
sta picker_entry_pos
L60FF: lda L6128
cmp $D920
bne L6110
@ -1571,7 +1571,7 @@ L60FF: lda L6128
lda winfo_entrydlg_file_picker
jsr L62C8
L6110: inc L6128
add16 pos_D917+2, #8, pos_D917+2
add16 picker_entry_pos+2, #8, picker_entry_pos+2
jmp L608E
L6127: .byte 0