diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index 7a13cdb977..f279178fd7 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -62,7 +62,7 @@ public class ChatFragment extends Table{ update(() -> { - if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){ + if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown())){ toggle(); } diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java index 5405d14959..12195af8a9 100644 --- a/core/src/mindustry/ui/fragments/MinimapFragment.java +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -43,8 +43,10 @@ public class MinimapFragment extends Fragment{ elem.visible(() -> shown); elem.update(() -> { - elem.requestKeyboard(); - elem.requestScroll(); + if(!ui.chatfrag.shown()){ + elem.requestKeyboard(); + elem.requestScroll(); + } elem.setFillParent(true); elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());