Keep add buttons visible when adding list elements

Author: NotRyken

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Added option to revert config changes on exit (no change to exiting via ESC)
 - Moved key selector button to adjacent trigger type button
 - Added filter fields for notification and trigger lists
+- Fixed lists not auto-scrolling when adding new fields
 
 ## 2.3.8
 

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/AdvancedOptionList.java

@@ -48,6 +48,8 @@
  */
 public class AdvancedOptionList extends DragReorderList {
     private final Notification notif;
+    private OptionList.Entry.ActionButtonEntry addExclTrigEntry;
+    private OptionList.Entry.ActionButtonEntry addRespMsgEntry;
 
     public AdvancedOptionList(Minecraft mc, int width, int height, int y, int entryWidth,
                               int entryHeight, int entrySpacing, Notification notif) {
@@ -57,6 +59,22 @@ public AdvancedOptionList(Minecraft mc, int width, int height, int y, int entryW
                         Entry.ResponseFieldEntry.class, notif::moveResponseMessage
                 )));
         this.notif = notif;
+        
+        addExclTrigEntry = new OptionList.Entry.ActionButtonEntry(
+                entryX, entryWidth, entryHeight, Component.literal("+"), null, -1,
+                (button) -> {
+                    notif.exclusionTriggers.add(new Trigger());
+                    init();
+                    ensureVisible(addExclTrigEntry);
+                });
+        
+        addRespMsgEntry = new OptionList.Entry.ActionButtonEntry(
+                entryX, entryWidth, entryHeight, Component.literal("+"), null, -1,
+                (button) -> {
+                    notif.responseMessages.add(new ResponseMessage());
+                    init();
+                    ensureVisible(addRespMsgEntry);
+                });
     }
 
     @Override
@@ -107,12 +125,8 @@ protected void addEntries() {
                 addEntry(new Entry.ExclusionFieldEntry(dynEntryX, dynEntryWidth, entryHeight,
                         this, notif, notif.exclusionTriggers.get(i), i));
             }
-            addEntry(new OptionList.Entry.ActionButtonEntry(entryX, entryWidth, entryHeight,
-                    Component.literal("+"), null, -1,
-                    (button) -> {
-                        notif.exclusionTriggers.add(new Trigger());
-                        init();
-                    }));
+            addExclTrigEntry.setBounds(entryX, entryWidth, entryHeight);
+            addEntry(addExclTrigEntry);
         }
 
         addEntry(new OptionList.Entry.TextEntry(entryX, entryWidth, entryHeight,
@@ -130,12 +144,8 @@ protected void addEntries() {
                 addEntry(e);
                 addEntry(new SpaceEntry(e));
             }
-            addEntry(new OptionList.Entry.ActionButtonEntry(entryX, entryWidth, entryHeight,
-                    Component.literal("+"), null, -1,
-                    (button) -> {
-                        notif.responseMessages.add(new ResponseMessage());
-                        init();
-                    }));
+            addRespMsgEntry.setBounds(entryX, entryWidth, entryHeight);
+            addEntry(addRespMsgEntry);
         }
 
         addEntry(new OptionList.Entry.TextEntry(entryX, entryWidth, entryHeight,

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/MainOptionList.java

@@ -54,12 +54,23 @@
 public class MainOptionList extends DragReorderList {
     private String filterString = "";
     private @Nullable Pattern filterPattern = null;
+    private OptionList.Entry.ActionButtonEntry addNotifEntry;
 
     public MainOptionList(Minecraft mc, int width, int height, int y, int entryWidth,
                           int entryHeight, int entrySpacing) {
         super(mc, width, height, y, entryWidth, entryHeight, entrySpacing, () -> {}, 
                 new HashMap<>(Map.of(Entry.NotifConfigEntry.class, (source, dest) ->
                         Config.get().changeNotifPriority(++source, ++dest))));
+        
+        addNotifEntry = new OptionList.Entry.ActionButtonEntry(
+                entryX, entryWidth, entryHeight, Component.literal("+"), null, -1,
+                (button) -> {
+                    Config.get().addNotif();
+                    filterString = "";
+                    filterPattern = null;
+                    init();
+                    ensureVisible(addNotifEntry);
+                });
     }
 
     @Override
@@ -71,14 +82,8 @@ protected void addEntries() {
         addEntry(new Entry.TitleAndSearchEntry(entryX, entryWidth, entryHeight, this));
 
         refreshNotifSubList();
-        addEntry(new OptionList.Entry.ActionButtonEntry(entryX, entryWidth, entryHeight,
-                Component.literal("+"), null, -1,
-                (button) -> {
-                    Config.get().addNotif();
-                    filterString = "";
-                    filterPattern = null;
-                    init();
-                }));
+        addNotifEntry.setBounds(entryX, entryWidth, entryHeight);
+        addEntry(addNotifEntry);
     }
 
     protected void refreshNotifSubList() {

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/NotifOptionList.java

@@ -48,6 +48,7 @@ public class NotifOptionList extends DragReorderList {
     private final Notification notif;
     private String filterString = "";
     private @Nullable Pattern filterPattern = null;
+    private OptionList.Entry.ActionButtonEntry addTriggerEntry;
 
     public NotifOptionList(Minecraft mc, int width, int height, int y, int entryWidth,
                            int entryHeight, int entrySpacing, Notification notif) {
@@ -57,21 +58,25 @@ public NotifOptionList(Minecraft mc, int width, int height, int y, int entryWidt
                                 moveTrigger(notif, source, dest))));
         this.notif = notif;
         notif.editing = true;
+        
+        addTriggerEntry = new OptionList.Entry.ActionButtonEntry(
+                entryX, entryWidth, entryHeight, Component.literal("+"), null, -1,
+                (button) -> {
+                    notif.triggers.add(new Trigger());
+                    filterString = "";
+                    filterPattern = null;
+                    init();
+                    ensureVisible(addTriggerEntry);
+                });
     }
 
     @Override
     protected void addEntries() {
         addEntry(new Entry.TitleAndSearchEntry(entryX, entryWidth, entryHeight, this));
 
         refreshTriggerSubList();
-        addEntry(new OptionList.Entry.ActionButtonEntry(entryX, entryWidth, entryHeight,
-                Component.literal("+"), null, -1,
-                (button) -> {
-                    notif.triggers.add(new Trigger());
-                    filterString = "";
-                    filterPattern = null;
-                    init();
-                }));
+        addTriggerEntry.setBounds(entryX, entryWidth, entryHeight);
+        addEntry(addTriggerEntry);
 
         addEntry(new OptionList.Entry.TextEntry(entryX, entryWidth, entryHeight,
                 localized("option", "notif"), null, -1));

common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/OptionList.java

@@ -227,12 +227,14 @@ public TextEntry(int x, int width, int height, Component message,
         }
 
         public static class ActionButtonEntry extends Entry {
+            private final Button button;
+            
             public ActionButtonEntry(int x, int width, int height, Component message,
                                      @Nullable Tooltip tooltip, int tooltipDelay,
                                      Button.OnPress onPress) {
                 super();
 
-                Button button = Button.builder(message, onPress)
+                button = Button.builder(message, onPress)
                         .pos(x, 0)
                         .size(width, height)
                         .build();
@@ -241,6 +243,11 @@ public ActionButtonEntry(int x, int width, int height, Component message,
 
                 elements.add(button);
             }
+            
+            public void setBounds(int x, int width, int height) {
+                button.setPosition(x, 0);
+                button.setSize(width, height);
+            }
         }
 
         public static class SilentActionButtonEntry extends Entry {