Change: Focus on the most relevant text fields when opening various GUIs

Zailer43 · Sep 12, 2024 · 03ceaa2 · 03ceaa2
1 parent b2f74e2
commit 03ceaa2
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 16 deletions.
diff --git a/src/main/java/fzmm/zailer/me/client/gui/BaseFzmmScreen.java b/src/main/java/fzmm/zailer/me/client/gui/BaseFzmmScreen.java
@@ -28,6 +28,7 @@
 import io.wispforest.owo.ui.core.*;
 import io.wispforest.owo.ui.parsing.UIModel;
 import io.wispforest.owo.ui.parsing.UIParsing;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -70,16 +71,27 @@ protected void build(StyledFlowLayout rootComponent) {
 
         this.symbolChatCompat.addSymbolChatComponents(this);
 
-        this.setupButtonsCallbacks(rootComponent);
+        this.setup(rootComponent);
         rootComponent.child(this.snackBarLayout);
+    }
 
-
+    @Override
+    protected void init() {
+        super.init();
         if (FzmmClient.CONFIG.history.automaticallyRecoverScreens() && this instanceof IMementoScreen mementoScreen) {
             mementoScreen.getMemento().ifPresent(mementoScreen::restoreMemento);
         }
+
+        if (this.getRoot().focusHandler() != null) {
+            this.initFocus(this.getRoot().focusHandler());
+        }
+    }
+
+    protected void initFocus(FocusHandler focusHandler) {
+
     }
 
-    protected abstract void setupButtonsCallbacks(FlowLayout rootComponent);
+    protected abstract void setup(FlowLayout rootComponent);
 
     @Override
     public void removed() {

diff --git a/src/main/java/fzmm/zailer/me/client/gui/HistoryScreen.java b/src/main/java/fzmm/zailer/me/client/gui/HistoryScreen.java
@@ -32,7 +32,7 @@ public HistoryScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         this.contentLayout = rootComponent.childById(FlowLayout.class, CONTENT_ID);
         checkNull(this.contentLayout, "flow-layout", CONTENT_ID);
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/banner_editor/BannerEditorScreen.java b/src/main/java/fzmm/zailer/me/client/gui/banner_editor/BannerEditorScreen.java
@@ -58,7 +58,7 @@ public BannerEditorScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         //preview
         this.bannerPreview = rootComponent.childById(ItemComponent.class, BANNER_PREVIEW_ID);
         checkNull(this.bannerPreview, "flow-layout", BANNER_PREVIEW_ID);

diff --git a/src/main/java/fzmm/zailer/me/client/gui/converters/ConvertersScreen.java b/src/main/java/fzmm/zailer/me/client/gui/converters/ConvertersScreen.java
@@ -17,7 +17,7 @@ public ConvertersScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         this.setTabs(selectedTab);
         ScreenTabRow.setup(rootComponent, "tabs", selectedTab);
         for (var converterTab : ConvertersTabs.values()) {

diff --git a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/EncryptBookScreen.java b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/EncryptBookScreen.java
@@ -25,6 +25,7 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.Component;
 import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -57,7 +58,7 @@ public EncryptBookScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         assert this.client != null;
         assert this.client.player != null;
 
@@ -103,6 +104,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
         ButtonRow.setup(rootComponent, ButtonRow.getButtonId("faq"), true, this::faqExecute);
     }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.messageTextArea, Component.FocusSource.MOUSE_CLICK);
+    }
+
     private void updateDecryptorProfileList() {
         List<TranslationEncryptProfile> decryptorProfiles = getProfiles();
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/head_gallery/HeadGalleryScreen.java b/src/main/java/fzmm/zailer/me/client/gui/head_gallery/HeadGalleryScreen.java
@@ -24,6 +24,7 @@
 import io.wispforest.owo.ui.core.Component;
 import io.wispforest.owo.ui.core.Insets;
 import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.util.FocusHandler;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.screen.Screen;
@@ -84,7 +85,7 @@ public HeadGalleryScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         this.page = 1;
         this.selectedTags = new HashSet<>();
         this.availableTags = new HashSet<>();
@@ -160,6 +161,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
         this.setPage(1);
     }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.contentSearchField, Component.FocusSource.MOUSE_CLICK);
+    }
+
     private void categoryButtonExecute(ButtonComponent selectedButton, String category, @Nullable Runnable callback) {
         assert this.client != null;
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/head_generator/HeadGeneratorScreen.java b/src/main/java/fzmm/zailer/me/client/gui/head_generator/HeadGeneratorScreen.java
@@ -37,6 +37,7 @@
 import io.wispforest.owo.ui.core.*;
 import io.wispforest.owo.ui.core.Component;
 import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.screen.Screen;
@@ -103,7 +104,7 @@ public HeadGeneratorScreen(@Nullable Screen parent) {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         this.headComponentEntries = new ArrayList<>();
         this.headCompoundComponentEntries = new ArrayList<>();
         this.baseSkin = new BufferedImage(SkinPart.MAX_WIDTH, SkinPart.MAX_HEIGHT, BufferedImage.TYPE_INT_ARGB);
@@ -176,6 +177,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
         this.updatePreviews();
     }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.skinElements.valueField(), Component.FocusSource.MOUSE_CLICK);
+    }
+
     private void updateCategory(IHeadCategory category) {
         this.selectedCategory = category;
         this.applyFilters();

diff --git a/src/main/java/fzmm/zailer/me/client/gui/imagetext/ImagetextScreen.java b/src/main/java/fzmm/zailer/me/client/gui/imagetext/ImagetextScreen.java
@@ -29,6 +29,7 @@
 import io.wispforest.owo.ui.component.*;
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.item.ItemStack;
@@ -72,7 +73,7 @@ public ImagetextScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         FzmmConfig.Imagetext config = FzmmClient.CONFIG.imagetext;
 
         // image options
@@ -214,6 +215,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
         this.setSmallGuiAnimation(this.width);
     }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.imageElements.valueField(), Component.FocusSource.MOUSE_CLICK);
+    }
+
     @SuppressWarnings("unchecked")
     private void setTabs(FlowLayout rootComponent, ITabsEnum selectedTab, ITabsEnum[] enumValues, HashMap<String, IScreenTab> tabsHashMap) {
         Enum<? extends ITabsEnum> selectedTabEnum = (Enum<? extends ITabsEnum>) selectedTab;

diff --git a/src/main/java/fzmm/zailer/me/client/gui/main/MainScreen.java b/src/main/java/fzmm/zailer/me/client/gui/main/MainScreen.java
@@ -29,7 +29,7 @@ public MainScreen(@Nullable Screen parent) {
 
     @Override
     @SuppressWarnings("ConstantConditions")
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         rootComponent.childById(ButtonComponent.class, "config-button")
                 .onPress(button -> this.client.setScreen(ConfigScreen.create(FzmmClient.CONFIG, this)));
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/player_statue/PlayerStatueScreen.java b/src/main/java/fzmm/zailer/me/client/gui/player_statue/PlayerStatueScreen.java
@@ -49,7 +49,7 @@ public PlayerStatueScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         PlayerEntity player = MinecraftClient.getInstance().player;
         assert player != null;
         //general

diff --git a/src/main/java/fzmm/zailer/me/client/gui/text_format/TextFormatScreen.java b/src/main/java/fzmm/zailer/me/client/gui/text_format/TextFormatScreen.java
@@ -20,6 +20,8 @@
 import io.wispforest.owo.ui.component.LabelComponent;
 import io.wispforest.owo.ui.component.TextBoxComponent;
 import io.wispforest.owo.ui.container.FlowLayout;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.item.ItemStack;
@@ -65,7 +67,7 @@ public TextFormatScreen(@Nullable Screen parent) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         this.messagePreviewLabel = rootComponent.childById(LabelComponent.class, MESSAGE_PREVIEW_ID);
         BaseFzmmScreen.checkNull(this.messagePreviewLabel, "label", MESSAGE_PREVIEW_ID);
 
@@ -102,6 +104,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
         this.tabCallback(this.getTab(selectedTab, ITextFormatTab.class));
     }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.messageTextField, Component.FocusSource.MOUSE_CLICK);
+    }
+
     private void tabCallback(ITextFormatTab tab) {
         this.updateMessagePreview();
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/utils/CopyTextScreen.java b/src/main/java/fzmm/zailer/me/client/gui/utils/CopyTextScreen.java
@@ -18,7 +18,7 @@ public CopyTextScreen(@Nullable Screen parent, Text textToCopy) {
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         FlowLayout flowLayout = rootComponent.childById(FlowLayout.class, COPY_BUTTONS_LIST_ID);
         if (flowLayout == null)
             return;

diff --git a/src/main/java/fzmm/zailer/me/client/gui/utils/auto_placer/AbstractAutoPlacer.java b/src/main/java/fzmm/zailer/me/client/gui/utils/auto_placer/AbstractAutoPlacer.java
@@ -37,7 +37,7 @@ public AbstractAutoPlacer(String screenPath, String baseScreenTranslationKey, @N
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         assert this.client != null;
         assert this.client.player != null;
 

diff --git a/src/main/java/fzmm/zailer/me/client/gui/utils/select_item/SelectItemScreen.java b/src/main/java/fzmm/zailer/me/client/gui/utils/select_item/SelectItemScreen.java
@@ -14,6 +14,7 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.Component;
 import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.util.FocusHandler;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerInventory;
@@ -64,7 +65,7 @@ public SelectItemScreen(@Nullable Screen parent, List<RequestedItem> requestedIt
     }
 
     @Override
-    protected void setupButtonsCallbacks(FlowLayout rootComponent) {
+    protected void setup(FlowLayout rootComponent) {
         assert this.client != null;
         assert this.client.player != null;
 
@@ -87,7 +88,11 @@ protected void setupButtonsCallbacks(FlowLayout rootComponent) {
             this.execute(false);
             this.close();
         });
+    }
 
+    @Override
+    protected void initFocus(FocusHandler focusHandler) {
+        focusHandler.focus(this.searchField, Component.FocusSource.MOUSE_CLICK);
     }
 
     private void setupSourceButtons(FlowLayout rootComponent) {