mirror of
https://github.com/mi57730/a2d.git
synced 2024-06-25 21:29:30 +00:00
Merge remote-tracking branch 'origin/disasm'
This commit is contained in:
commit
74fb526ced
|
@ -298,11 +298,13 @@ highlight_count: ; number of highlighted icons
|
||||||
highlight_list: ; selected icons
|
highlight_list: ; selected icons
|
||||||
.res 127, 0
|
.res 127, 0
|
||||||
|
|
||||||
|
max_draggable_items = 20
|
||||||
|
|
||||||
;;; Polygon holding the composite outlines of all icons
|
;;; Polygon holding the composite outlines of all icons
|
||||||
;;; being dragged.
|
;;; being dragged.
|
||||||
|
|
||||||
drag_outline_buffer:
|
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.
|
;; Meets the threshold - it is a drag, not just a click.
|
||||||
is_drag:
|
is_drag:
|
||||||
lda highlight_count
|
lda highlight_count
|
||||||
cmp #$15 ; max number of draggable items?
|
cmp #max_draggable_items + 1
|
||||||
bcc :+
|
bcc :+
|
||||||
jmp ignore_drag ; too many
|
jmp ignore_drag ; too many
|
||||||
|
|
||||||
|
|
|
@ -4609,7 +4609,7 @@ L66A0: .word 0
|
||||||
.proc update_window_menu_items
|
.proc update_window_menu_items
|
||||||
ldx active_window_id
|
ldx active_window_id
|
||||||
beq disable_menu_items
|
beq disable_menu_items
|
||||||
jmp check_menu_items
|
jmp check_view_menu_items
|
||||||
|
|
||||||
disable_menu_items:
|
disable_menu_items:
|
||||||
copy #MGTK::disablemenu_disable, disablemenu_params::disable
|
copy #MGTK::disablemenu_disable, disablemenu_params::disable
|
||||||
|
@ -4627,8 +4627,7 @@ disable_menu_items:
|
||||||
copy #0, menu_dispatch_flag
|
copy #0, menu_dispatch_flag
|
||||||
rts
|
rts
|
||||||
|
|
||||||
;; Is this residue of a Windows menu???
|
check_view_menu_items:
|
||||||
check_menu_items:
|
|
||||||
dex
|
dex
|
||||||
lda win_view_by_table,x
|
lda win_view_by_table,x
|
||||||
and #$0F
|
and #$0F
|
||||||
|
@ -5098,7 +5097,7 @@ L6B3A: lda icon_params2
|
||||||
|
|
||||||
L6B60: copy #0, checkitem_params::check
|
L6B60: copy #0, checkitem_params::check
|
||||||
jsr check_item
|
jsr check_item
|
||||||
L6B68: lda #$01
|
L6B68: lda #desktop_aux::menu_item_id_view_by_icon
|
||||||
sta checkitem_params::menu_item
|
sta checkitem_params::menu_item
|
||||||
sta checkitem_params::check
|
sta checkitem_params::check
|
||||||
jsr check_item
|
jsr check_item
|
||||||
|
|
Loading…
Reference in New Issue
Block a user