mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 06:22:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2020-05-20 13:56:23 -04:00
commit e8eecf8a1f
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/ui/fragments/ChatFragment.java
View file

@ -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();
}

6
core/src/mindustry/ui/fragments/MinimapFragment.java
View file

@ -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());