Listbox: Drop 'listbox::kHeight' requirement

Actually adds code but this is progress towards a minimal listbox control block.
a2stuff · Oct 8, 2023 · d58f05d · d58f05d
1 parent fff2a33
commit d58f05d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/desk.acc/find.files.s b/desk.acc/find.files.s
@@ -601,7 +601,6 @@ show_index:     .byte   $FF
 
 .scope listbox
         winfo = winfo_results
-        kHeight = kResultsHeight
         kRows = kResultsRows
         num_items = num_entries
         item_pos = cur_pos

diff --git a/desk.acc/sounds.s b/desk.acc/sounds.s
@@ -1248,7 +1248,6 @@ OnListSelectionNoChange := OnListSelectionChange
 
 .scope listbox
         winfo = winfo_listbox
-        kHeight = winfo_listbox::kHeight
         kRows = kListRows
         num_items = num_sounds
         item_pos = itempos

diff --git a/disk_copy/auxlc.s b/disk_copy/auxlc.s
@@ -1420,7 +1420,6 @@ CheckAlpha:
 
 .scope listbox
         winfo = winfo_drive_select
-        kHeight = kListBoxHeight
         kRows = kListRows
         num_items = num_drives
         item_pos = list_entry_pos

diff --git a/lib/file_dialog.s b/lib/file_dialog.s
@@ -1486,7 +1486,6 @@ HandleCancel:   jmp     0
 
 .scope listbox
         winfo = file_dialog_res::winfo_listbox
-        kHeight = file_dialog_res::winfo_listbox::kHeight
         kRows = file_dialog_res::kListRows
         num_items = num_file_names
         item_pos = file_dialog_res::picker_entry_pos

diff --git a/lib/listbox.s b/lib/listbox.s
@@ -15,7 +15,6 @@
 ;;;
 ;;; Requires `listbox` scope with:
 ;;; * `winfo` - winfo of the list control
-;;; * `kHeight` - height of the list in pixels
 ;;; * `kRows` - number of visible rows in the list
 ;;; * `num_items` - number of items in the list
 ;;; * `item_pos` - a scratch MGTK::Point
@@ -455,11 +454,18 @@ skip:   lda     #SELF_MODIFIED_BYTE
 ;;; the GrafPort using the client's `SetPortForList`.
 
 .proc _SetPort
+        maprect := listbox::winfo+MGTK::Winfo::port+MGTK::GrafPort::maprect
+
+        ;; Set y2 to height
+        sub16   maprect+MGTK::Rect::y2, maprect+MGTK::Rect::y1, maprect+MGTK::Rect::y2
+
         ldax    #kListItemHeight
         ldy     listbox::winfo+MGTK::Winfo::vthumbpos
         jsr     Multiply_16_8_16
-        stax    listbox::winfo+MGTK::Winfo::port+MGTK::GrafPort::maprect+MGTK::Rect::y1
-        addax   #listbox::kHeight, listbox::winfo+MGTK::Winfo::port+MGTK::GrafPort::maprect+MGTK::Rect::y2
+        stax    maprect+MGTK::Rect::y1
+
+        ;; Set y2 to bottom
+        addax   maprect+MGTK::Rect::y2, maprect+MGTK::Rect::y2
 
         jmp     SetPortForList
 .endproc ; _SetPort