Merge remote-tracking branch 'origin/master'

CONTRIBUTING.md

@@ -26,6 +26,7 @@ This means:
 - 4 spaces indentation
 - `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more.
 - No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day)
+- Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid.
 
 Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to get correct formatting when developing Mindustry.
 

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

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