Merge remote-tracking branch 'origin/disasm'

This commit is contained in:
Joshua Bell 2019-01-13 12:02:09 -08:00
commit 74fb526ced
2 changed files with 7 additions and 6 deletions

View File

@ -298,11 +298,13 @@ highlight_count: ; number of highlighted icons
highlight_list: ; selected icons
.res 127, 0
max_draggable_items = 20
;;; Polygon holding the composite outlines of all icons
;;; being dragged.
drag_outline_buffer:
.res 680, 0
.res max_draggable_items * (.sizeof(MGTK::Point) * 8 + 2), 0
;;; ============================================================
@ -1085,7 +1087,7 @@ y_lo: lda deltay
;; Meets the threshold - it is a drag, not just a click.
is_drag:
lda highlight_count
cmp #$15 ; max number of draggable items?
cmp #max_draggable_items + 1
bcc :+
jmp ignore_drag ; too many

View File

@ -4609,7 +4609,7 @@ L66A0: .word 0
.proc update_window_menu_items
ldx active_window_id
beq disable_menu_items
jmp check_menu_items
jmp check_view_menu_items
disable_menu_items:
copy #MGTK::disablemenu_disable, disablemenu_params::disable
@ -4627,8 +4627,7 @@ disable_menu_items:
copy #0, menu_dispatch_flag
rts
;; Is this residue of a Windows menu???
check_menu_items:
check_view_menu_items:
dex
lda win_view_by_table,x
and #$0F
@ -5098,7 +5097,7 @@ L6B3A: lda icon_params2
L6B60: copy #0, checkitem_params::check
jsr check_item
L6B68: lda #$01
L6B68: lda #desktop_aux::menu_item_id_view_by_icon
sta checkitem_params::menu_item
sta checkitem_params::check
jsr check_item