From 09d6a16b34cf53092dc1f07b93ba2fb331e0584f Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sat, 3 Apr 2021 08:47:17 -0700 Subject: [PATCH] disasm: File dialog focus flag --- desktop/ovl_file_copy.s | 6 +++--- desktop/ovl_file_delete.s | 2 +- desktop/ovl_file_dialog.s | 5 +++-- desktop/ovl_selector_edit.s | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/desktop/ovl_file_copy.s b/desktop/ovl_file_copy.s index e74e77e6..a284792e 100644 --- a/desktop/ovl_file_copy.s +++ b/desktop/ovl_file_copy.s @@ -38,7 +38,7 @@ lda #0 sta path_buf0 - sta file_dialog::L51AE + sta file_dialog::focus_in_input2_flag copy #1, path_buf2 copy #kGlyphInsertionPoint, path_buf2+1 rts @@ -117,7 +117,7 @@ jt_destination_filename: ;; set up flags for destination lda #$80 sta file_dialog::L50A8 - sta file_dialog::L51AE + sta file_dialog::focus_in_input2_flag lda selected_index sta LD921 lda #$FF @@ -236,7 +236,7 @@ err: lda #ERR_INVALID_PATHNAME copy #kGlyphInsertionPoint, path_buf2+1 copy #0, file_dialog::L50A8 copy #$FF, selected_index - copy #0, file_dialog::L51AE + copy #0, file_dialog::focus_in_input2_flag lda LD8F0 sta LD8F2 diff --git a/desktop/ovl_file_delete.s b/desktop/ovl_file_delete.s index d6267c27..5eb9332a 100644 --- a/desktop/ovl_file_delete.s +++ b/desktop/ovl_file_delete.s @@ -36,7 +36,7 @@ lda #0 sta path_buf0 - sta file_dialog::L51AE + sta file_dialog::focus_in_input2_flag copy #1, path_buf2 copy #kGlyphInsertionPoint, path_buf2+1 diff --git a/desktop/ovl_file_dialog.s b/desktop/ovl_file_dialog.s index b024b853..44ade2dc 100644 --- a/desktop/ovl_file_dialog.s +++ b/desktop/ovl_file_dialog.s @@ -136,7 +136,7 @@ l1: lda winfo_file_dialog sta screentowindow_window_id MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx - bit L51AE + bit focus_in_input2_flag bmi l2 MGTK_RELAY_CALL MGTK::InRect, file_dialog_res::input1_rect cmp #MGTK::inrect_inside @@ -154,7 +154,8 @@ l5: MGTK_RELAY_CALL MGTK::InitPort, main_grafport jmp event_loop .endproc -L51AE: .byte 0 +focus_in_input2_flag: + .byte 0 ;;; ============================================================ diff --git a/desktop/ovl_selector_edit.s b/desktop/ovl_selector_edit.s index 86b1b8f2..eda52aaa 100644 --- a/desktop/ovl_selector_edit.s +++ b/desktop/ovl_selector_edit.s @@ -85,7 +85,7 @@ buffer: .res 16, 0 dex bpl :- - copy #0, file_dialog::L51AE + copy #0, file_dialog::focus_in_input2_flag copy #$80, file_dialog::dual_inputs_flag copy #1, path_buf2 copy #kGlyphInsertionPoint, path_buf2+1 @@ -205,7 +205,7 @@ jt_entry_name: bpl :- lda #$80 - sta file_dialog::L51AE + sta file_dialog::focus_in_input2_flag sta file_dialog::L5105 lda LD8F0 sta LD8F1 @@ -320,7 +320,7 @@ ok: MGTK_RELAY_CALL MGTK::InitPort, main_grafport jsr file_dialog::jt_redraw_input lda #$00 sta file_dialog::L5105 - sta file_dialog::L51AE + sta file_dialog::focus_in_input2_flag lda LD8F1 sta LD8F0 rts