Improve editor toggle button

Author: NotRyken

common/src/main/java/dev/terminalmc/signtweaks/gui/widget/UnfocusingButton.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2026 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.signtweaks.gui.widget;
+
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
+
+public class UnfocusingButton extends Button.Plain {
+
+    public UnfocusingButton(
+            int x,
+            int y,
+            int width,
+            int height,
+            Component message,
+            OnPress onPress
+    ) {
+        super(x, y, width, height, message, onPress, Button.DEFAULT_NARRATION);
+    }
+
+    /**
+     * Why they didn't make this use a field I have no idea.
+     */
+    @Override
+    public boolean shouldTakeFocusAfterInteraction() {
+        return false;
+    }
+}

common/src/main/java/dev/terminalmc/signtweaks/mixin/gui/AbstractSignEditScreenMixin.java

@@ -19,15 +19,16 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.terminalmc.signtweaks.SignTweaks;
+import dev.terminalmc.signtweaks.gui.widget.UnfocusingButton;
 import dev.terminalmc.signtweaks.util.inject.ISignScreen;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.CycleButton;
+import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -55,6 +56,9 @@ protected AbstractSignEditScreenMixin(Component title) {
     @Shadow
     public abstract void onClose();
 
+    @Unique
+    private boolean signTweaks$isReloading;
+
     /**
      * On creation of an {@link AbstractSignEditScreen}, resets the value of
      * {@link SignTweaks#enhancedEditing} to the default value and stores the original sign text.
@@ -96,8 +100,6 @@ private GuiEventListener wrapAddDoneButton(
         int rowCount = 0;
         if (options().showActionButtons)
             rowCount++;
-        if (options().showEditorToggleButton)
-            rowCount++;
 
         int totalWidth = 200;
         int buttonHeight = 20;
@@ -154,31 +156,45 @@ private GuiEventListener wrapAddDoneButton(
                             .bounds(movingX, movingY, buttonWidth, buttonHeight)
                             .build();
             original.call(instance, revertButton);
-
-            movingY += rowHeight;
         }
 
-        // Enhanced editor toggle button
+        // Add the 'Done' button last.
         if (options().showEditorToggleButton) {
-            CycleButton<@NotNull Boolean> statusButton = CycleButton
-                    .onOffBuilder(SignTweaks.enhancedEditing)
-                    .create(
-                            baseX,
-                            movingY,
-                            totalWidth,
-                            buttonHeight,
-                            localized("button", "enhancedEditing"),
-                            (button, status) -> {
-                                if (SignTweaks.enhancedEditing != status) {
-                                    SignTweaks.enhancedEditing = status;
-                                    init();
-                                }
-                            }
-                    );
-            original.call(instance, statusButton);
-        }
+            if (doneButton instanceof Button button) {
+                // reduce width to add space for editor toggle button
+                button.setWidth(button.getWidth() - spaceX - buttonHeight);
+                GuiEventListener result = original.call(instance, button);
 
-        // Add the 'Done' button last.
+                // add editor toggle button
+                UnfocusingButton toggleButton = new UnfocusingButton(
+                        button.getX() + button.getWidth() + spaceX,
+                        button.getY(),
+                        buttonHeight, // square
+                        buttonHeight,
+                        Component.literal("\u270E").withStyle(SignTweaks.enhancedEditing // ✎
+                                ? ChatFormatting.GREEN
+                                : ChatFormatting.RED),
+                        (b) -> {
+                            SignTweaks.enhancedEditing = !SignTweaks.enhancedEditing;
+                            init();
+                        }
+                );
+                toggleButton.setTooltip(Tooltip.create(localized(
+                        "button",
+                        "enhancedEditing.tooltip." + (SignTweaks.enhancedEditing
+                                ? "enabled"
+                                : "disabled")
+                )));
+                original.call(instance, toggleButton);
+                return result;
+            } else {
+                SignTweaks.LOG.error(
+                        "Done button has wrong type! Expected '{}', got '{}'",
+                        Button.class,
+                        doneButton.getClass()
+                );
+            }
+        }
         return original.call(instance, doneButton);
     }
 

common/src/main/resources/assets/signtweaks/lang/en_us.json

@@ -7,7 +7,8 @@
 
   "message.signtweaks.copied": "Text copied from sign!",
 
-  "button.signtweaks.enhancedEditing": "Enhanced Editing",
+  "button.signtweaks.enhancedEditing.tooltip.enabled": "Enhanced editing enabled.",
+  "button.signtweaks.enhancedEditing.tooltip.disabled": "Enhanced editing disabled.",
   "button.signtweaks.copy": "Copy",
   "button.signtweaks.replace": "Replace",
   "button.signtweaks.erase": "Erase",