fix some focus issues with the search box

Author: douira

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

@@ -32,7 +32,6 @@
 import java.io.IOException;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Stream;
@@ -302,6 +301,12 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
             return true;
         }
 
+        // TODO: switching between the search and the regular mode breaks the keyboard focus
+        if (this.getFocused() == this.pageList && this.controlList == this.searchWidget ||
+                this.getFocused() == this.searchWidget && this.controlList == this.optionList) {
+            this.setFocused(this.controlList);
+        }
+
         return true;
     }
 

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

@@ -75,6 +75,14 @@ public GuiEventListener getFocused() {
 
     @Override
     public void setFocused(@Nullable GuiEventListener guiEventListener) {
+        if (this.focusedElement != null) {
+            this.focusedElement.setFocused(false);
+        }
+
+        if (guiEventListener != null) {
+            guiEventListener.setFocused(true);
+        }
+
         this.focusedElement = guiEventListener;
     }
 

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

@@ -74,7 +74,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             this.drawRect(graphics, this.getX(), this.getLimitY() - 1, this.getLimitX(), this.getLimitY(), Colors.THEME);
         }
 
-        if (this.drawFrame) {
+        if (this.drawFrame || this.enabled && this.isFocused()) {
             this.drawBorder(graphics, this.getX(), this.getY(), this.getLimitX(), this.getLimitY(), Colors.BUTTON_BORDER);
         }
     }

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

@@ -2,11 +2,13 @@
 
 import net.caffeinemc.mods.sodium.api.util.ColorABGR;
 import net.caffeinemc.mods.sodium.client.util.Dim2i;
+import net.minecraft.client.gui.ComponentPath;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.navigation.FocusNavigationEvent;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-// TODO: override some methods to make it not focusable?
 public class ScrollbarWidget extends AbstractWidget {
     private static final int COLOR = ColorABGR.pack(50, 50, 50, 150);
     private static final int HIGHLIGHT_COLOR = ColorABGR.pack(100, 100, 100, 150);
@@ -140,5 +142,11 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
 
     @Override
     public void updateNarration(NarrationElementOutput builder) {
+        // no narration
+    }
+
+    @Override
+    public @Nullable ComponentPath nextFocusPath(FocusNavigationEvent event) {
+        return null;
     }
 }

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

@@ -67,7 +67,8 @@ private void rebuild() {
         if (!this.searchBox.getValue().equals(this.query)) {
             this.searchBox.setValue(this.query);
         }
-        this.searchBox.setFocused(true);
+
+        this.setFocused(this.searchBox);
 
         var headerHeight = this.searchBox.getBottom() + Layout.INNER_MARGIN;
         if (this.scrollbar == null) {
@@ -103,8 +104,8 @@ private void rebuild() {
             if (lastSource == null || lastSource.getPage() != page) {
                 if (lastSource != null && !trailingSpace) {
                     listHeight += Layout.INNER_MARGIN;
-                    trailingSpace = true;
                 }
+
                 pageListHeight = listHeight = Math.max(pageListHeight, listHeight);
 
                 if (lastSource == null || lastSource.getModOptions() != modOptions) {