add search results with page list and clickable page list items

Author: douira

common/src/main/java/net/caffeinemc/mods/sodium/client/gui/VideoSettingsScreen.java

@@ -45,8 +45,6 @@
 // TODO: add button or some other way for user to reset a specific option, all options on a page, and all options of a mod to their default values (not just "reset" changes, but reset to default value)
 // TODO: make RD option respect Vanilla's >16 RD only allowed if memory >1GB constraint
 public class VideoSettingsScreen extends Screen implements ScreenPromptable {
-    private final List<ControlElement> controls = new ArrayList<>();
-
     private final Screen prevScreen;
 
     private ModOptions currentMod;
@@ -146,6 +144,7 @@ public void setPage(ModOptions modOptions, OptionPage page) {
             this.currentPage = page;
             this.rebuildOptionList();
         }
+        this.pageList.switchSelected(modOptions, page);
     }
 
     @Override
@@ -160,8 +159,6 @@ protected void init() {
     }
 
     private void rebuild() {
-        this.controls.clear();
-
         this.clearWidgets();
 
         // find the first non-external page
@@ -203,6 +200,10 @@ private void rebuild() {
         this.addRenderableWidget(this.undoButton);
         this.addRenderableWidget(this.applyButton);
         this.addRenderableWidget(this.closeButton);
+
+        if (this.searchWidget != null) {
+            this.startSearch(this.searchWidget);
+        }
     }
 
     private void rebuildOptionList() {
@@ -381,7 +382,11 @@ public ScreenPrompt getPrompt() {
     }
 
     private void startSearch() {
-        this.searchWidget = new SearchWidget(this::closeSearch, new Dim2i(0, 0, Layout.PAGE_LIST_WIDTH + Layout.INNER_MARGIN + Layout.OPTION_WIDTH + Layout.OPTION_LIST_SCROLLBAR_OFFSET + Layout.SCROLLBAR_WIDTH, this.height));
+        this.startSearch(null);
+    }
+
+    private void startSearch(@Nullable SearchWidget old) {
+        this.searchWidget = new SearchWidget(this, this::closeSearch, old, new Dim2i(0, 0, Layout.PAGE_LIST_WIDTH + Layout.INNER_MARGIN + Layout.OPTION_WIDTH, this.height));
         this.addRenderableWidget(this.searchWidget);
 
         this.removeWidget(this.pageList);

common/src/main/java/net/caffeinemc/mods/sodium/client/gui/widgets/CenteredFlatWidget.java

@@ -61,9 +61,9 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         }
 
         if (this.subtitle == null) {
-            this.drawString(graphics, this.truncateToFitWidth(this.label), x1 + Layout.TEXT_LEFT_PADDING, (int) Math.ceil(((y1 + (this.getHeight() - this.font.lineHeight) * 0.5f))), textColor);
+            this.drawString(graphics, this.truncateToFitWidth(this.label), x1 + Layout.TEXT_LEFT_PADDING, (int) Math.ceil(((y1 + (this.getTextBoxHeight() - this.font.lineHeight) * 0.5f))), textColor);
         } else {
-            var center = y1 + this.getHeight() * 0.5f;
+            var center = y1 + this.getTextBoxHeight() * 0.5f;
             this.drawString(graphics, this.truncateToFitWidth(this.label), x1 + Layout.TEXT_LEFT_PADDING, (int) Math.ceil(center - (this.font.lineHeight + Layout.TEXT_LINE_SPACING * 0.5f)), textColor);
             this.drawString(graphics, this.truncateToFitWidth(this.subtitle), x1 + Layout.TEXT_LEFT_PADDING, (int) Math.ceil(center + Layout.TEXT_LINE_SPACING * 0.5f), textColor);
         }
@@ -73,6 +73,10 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         }
     }
 
+    protected int getTextBoxHeight() {
+        return this.getHeight();
+    }
+
     private String truncateToFitWidth(Component text) {
         return this.truncateTextToFit(text.getString(), this.getWidth() - 14);
     }

common/src/main/java/net/caffeinemc/mods/sodium/client/gui/widgets/OptionListWidget.java

@@ -33,7 +33,7 @@ private void rebuild(Screen screen) {
         this.clearChildren();
         this.scrollbar = this.addRenderableChild(new ScrollbarWidget(new Dim2i(x + width + Layout.OPTION_LIST_SCROLLBAR_OFFSET, y, Layout.SCROLLBAR_WIDTH, height)));
 
-        int entryHeight = 18;
+        int entryHeight = this.font.lineHeight * 2;
         int listHeight = 0;
         for (OptionGroup group : this.page.groups()) {
             // Add each option's control element

common/src/main/java/net/caffeinemc/mods/sodium/client/gui/widgets/PageListWidget.java

@@ -82,16 +82,18 @@ private void rebuild() {
 
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-        graphics.fillGradient(this.getX(), this.getY(), this.getLimitX(), this.getLimitY(), Colors.BACKGROUND_LIGHT, Colors.BACKGROUND_DEFAULT);
+        renderBackgroundGradient(graphics, this.getX(), this.getY(), this.getLimitX(), this.getLimitY());
         graphics.enableScissor(this.getX(), this.search.getLimitY(), this.getLimitX(), this.getLimitY());
         super.render(graphics, mouseX, mouseY, delta);
         graphics.disableScissor();
 
-//        this.verticalScrollScissorGradient(graphics, scissorEnd);
-
         this.search.render(graphics, mouseX, mouseY, delta);
     }
 
+    public static void renderBackgroundGradient(GuiGraphics graphics, int x1, int y1, int x2, int y2) {
+        graphics.fillGradient(x1, y1, x2, y2, Colors.BACKGROUND_LIGHT, Colors.BACKGROUND_DEFAULT);
+    }
+
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
         this.scrollbar.scroll((int) (-verticalAmount * 10));
@@ -106,6 +108,17 @@ private void switchSelected(CenteredFlatWidget widget) {
         this.selected.setSelected(true);
     }
 
+    public void switchSelected(ModOptions modOptions, Page page) {
+        for (var child : this.children()) {
+            if (child instanceof PageEntryWidget pageEntryWidget) {
+                if (pageEntryWidget.page == page && pageEntryWidget.modOptions == modOptions) {
+                    this.switchSelected(pageEntryWidget);
+                    return;
+                }
+            }
+        }
+    }
+
     private class EntryWidget extends CenteredFlatWidget {
         EntryWidget(Dim2i dim, Component label, boolean isSelectable, ColorTheme theme) {
             super(dim, label, isSelectable, theme);