Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chat on Minimap Implementation (#2092)

Browse Source 
* chat on minimap implementation

* add braces
This commit is contained in:
zethnest
2020-05-20 23:34:49 +08:00
committed by GitHub
parent daa80955ac
commit 7030f69bc6
2 changed files with 5 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(() -> { 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(); toggle();
} }

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

@@ -43,8 +43,10 @@ public class MinimapFragment extends Fragment{
elem.visible(() -> shown); elem.visible(() -> shown);
elem.update(() -> { elem.update(() -> {
elem.requestKeyboard(); if(!ui.chatfrag.shown()){
elem.requestScroll(); elem.requestKeyboard();
elem.requestScroll();
}
elem.setFillParent(true); elem.setFillParent(true);
elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());