diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 1be75b37..284e069c 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index 8556373e..99c80215 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -176,6 +176,13 @@ S.MITEM.TEXT .EQ 9 CSTR * ... *-------------------------------------- BM.ID.APPLE .EQ 2 +BM.ID.CLOSE .EQ 4 +BM.ID.MAX .EQ 6 +BM.ID.MIN .EQ 8 +BM.ID.LEFT .EQ 10 +BM.ID.RIGHT .EQ 12 +BM.ID.UP .EQ 14 +BM.ID.DOWN .EQ 16 *-------------------------------------- S.BUT.F.DISABLED .EQ %10000000 * diff --git a/LIB/LIBGUI.G.BM.txt b/LIB/LIBGUI.G.BM.txt index 109b4a09..945f3ba4 100644 --- a/LIB/LIBGUI.G.BM.txt +++ b/LIB/LIBGUI.G.BM.txt @@ -89,6 +89,34 @@ BM.Min.AND .HS FF0F .HS 0F0F .HS FF0F *-------------------------------------- +BM.Left +*-------------------------------------- +BM.Right .DA #S.BM.F.BBP1 + .DA #1 RowBytes + .DA 7 W + .DA 7 Y + .DA BM.Right.AND-BM.Right + + .DA #%0000000 + .DA #%0000100 + .DA #%0001100 + .DA #%0011100 + .DA #%0001100 + .DA #%0000100 + .DA #%0000000 + +BM.Right.AND .DA #%1111001 + .DA #%1110001 + .DA #%1100001 + .DA #%1000001 + .DA #%1100001 + .DA #%1110001 + .DA #%1111001 +*-------------------------------------- +BM.Up +*-------------------------------------- +BM.Down +*-------------------------------------- MAN SAVE usr/src/lib/libgui.g.bm LOAD usr/src/lib/libgui.s diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt index 4b2af4f6..72b925dd 100644 --- a/LIB/LIBGUI.S.MENU.txt +++ b/LIB/LIBGUI.S.MENU.txt @@ -524,9 +524,24 @@ MENU.Show.Item ldy #S.MITEM.F ldx hSYSFON jsr DRAW.YATextAtDXDY -.3 +.3 ldy #S.MITEM.F + lda (ZPPtr1),y + cmp #S.MITEM.F.SUBMENU + bne .8 - clc + lda DX + sec + adc INE + sta DX + lda DX+1 + adc IE+1 + sta DX+1 + + ldx #BM.ID.RIGHT + >LDYA L.BMs,x + jsr DRAW.YABMAtDXDY + +.8 clc rts *-------------------------------------- MENU.GetIcon ldy #S.MITEM.pICON+1 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 10654c82..9c23abb6 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -13,8 +13,8 @@ NEW *-------------------------------------- WND.MAX .EQ 64 MENU.MAX .EQ 4 -MENU.LMargin .EQ 3 -MENU.RMargin .EQ 3 +MENU.LMargin .EQ 7 +MENU.RMargin .EQ 8 *-------------------------------------- .MA SWAP16 lda ]1 @@ -159,6 +159,10 @@ L.BM.Apple .DA BM.Apple L.BM.Close .DA BM.Close L.BM.Max .DA BM.Max L.BM.Min .DA BM.Min +L.BM.Left .DA BM.Left +L.BM.Right .DA BM.Right +L.BM.Up .DA BM.Up +L.BM.Down .DA BM.Down *-------------------------------------- L.CUR.SaveBuf .DA CUR.SaveBuf L.Cursors .DA CUR.Arrow