mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-01-19 16:57:20 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed chat box behavior

Browse Source 
GameScreen now ignores hotkeys while chat box is open
Esc closes chat box
Closing chat box will now set text to empty string
Chat output TextArea will no longer block touch events (i.e., inventory management)
This commit is contained in:
Collin Smith 2019-02-11 01:44:39 -08:00
parent 6336ead864
commit 5d3f5dc4b6
1 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
core/src/gdx/diablo/screen/GameScreen.java
View File

@ -16,6 +16,7 @@ import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.net.Socket;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.Touchable;
import com.badlogic.gdx.scenes.scene2d.ui.Touchpad;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
@ -128,48 +129,15 @@ public class GameScreen extends ScreenAdapter implements LoadingScreen.Loadable
background.setTopHeight(padding);
background.setRightWidth(padding);
background.setBottomHeight(padding);
}}) {
//boolean newlyVisible = false;
{
}}) {{
writeEnters = false;
//setTextFieldFilter(new TextFieldFilter() {
// @Override
// public boolean acceptChar(TextField textField, char c) {
// return c != ENTER_ANDROID && c != ENTER_DESKTOP;
// }
//});
/*setTextFieldListener(new TextFieldListener() {
@Override
public void keyTyped(TextField textField, char c) {
if (c == ENTER_ANDROID || c == ENTER_DESKTOP) {
//if (newlyVisible) {
// newlyVisible = false;
// return;
//}
String text = input.getText();
if (!text.isEmpty()) {
Gdx.app.debug(TAG, text);
Message message = new Message(player.stats.getName(), text);
out.println(Packets.build(message));
input.setText("");
}
input.setVisible(false);
}
}
});*/
}
//@Override
//public void setVisible(boolean visible) {
//if (visible && !isVisible()) {
// newlyVisible = true;
//}
// super.setVisible(visible);
//}
@Override
public void setVisible(boolean visible) {
if (!visible) input.setText("");
super.setVisible(visible);
}
};
input.setDebug(true);
input.setSize(Diablo.VIRTUAL_WIDTH * 0.75f, Diablo.fonts.fontformal12.getLineHeight() * 3);
@ -188,6 +156,7 @@ public class GameScreen extends ScreenAdapter implements LoadingScreen.Loadable
output.setAlignment(Align.topLeft);
output.setDisabled(true);
output.setVisible(true);
output.setTouchable(Touchable.disabled);
escapePanel = new EscapePanel();
@ -270,11 +239,17 @@ public class GameScreen extends ScreenAdapter implements LoadingScreen.Loadable
mappedKeyStateListener = new MappedKeyStateAdapter() {
@Override
public void onPressed(MappedKey key, int keycode) {
if (input.isVisible() && (key != Keys.Enter && key != Keys.Esc)) {
return;
}
if (key == Keys.Esc) {
if (escapePanel.isVisible()) {
escapePanel.setVisible(false);
} else if (input.isVisible()) {
input.setVisible(false);
} else if (inventoryPanel.isVisible()
|| characterPanel.isVisible()) {
|| characterPanel.isVisible()) {
inventoryPanel.setVisible(false);
characterPanel.setVisible(false);
} else {