djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Don't unfocus edit boxes when switching to keyboard/mouse mode

Browse Source
This commit is contained in:
isXander
2023-08-02 23:59:58 +01:00
parent 19cdf59666
commit dea2fe1f9d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/isxander/controlify/screenop/ScreenProcessor.java
View File

@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ComponentPath; import net.minecraft.client.gui.ComponentPath;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.components.tabs.Tab; import net.minecraft.client.gui.components.tabs.Tab;
import net.minecraft.client.gui.components.tabs.TabNavigationBar; import net.minecraft.client.gui.components.tabs.TabNavigationBar;
@ -63,7 +64,14 @@ public class ScreenProcessor<T extends Screen> {
public void onInputModeChanged(InputMode mode) { public void onInputModeChanged(InputMode mode) {
switch (mode) { switch (mode) {
case KEYBOARD_MOUSE -> ((ScreenAccessor) screen).invokeClearFocus(); case KEYBOARD_MOUSE -> {
boolean focusingEditBox = getFocusTree().stream()
.anyMatch(component -> component instanceof EditBox);
if (!focusingEditBox) {
((ScreenAccessor) screen).invokeClearFocus();
}
}
case CONTROLLER, MIXED -> { case CONTROLLER, MIXED -> {
if (!Controlify.instance().virtualMouseHandler().isVirtualMouseEnabled()) { if (!Controlify.instance().virtualMouseHandler().isVirtualMouseEnabled()) {
setInitialFocus(); setInitialFocus();