ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

key remapping: remove some unused widget and keylistener checks

Browse Source
This commit is contained in:
Adam
2019-06-07 19:06:06 -04:00
parent bb25aee4cc
commit 5f972f5bcc
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
View File

@@ -179,31 +179,23 @@ public class KeyRemappingPlugin extends Plugin
void lockChat() void lockChat()
{ {
Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT); Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
if (chatboxParent != null && chatboxParent.getOnKeyListener() != null) if (chatboxInput != null)
{ {
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); chatboxInput.setText(getPlayerNameWithIcon() + ": " + PRESS_ENTER_TO_CHAT);
if (chatboxInput != null)
{
chatboxInput.setText(getPlayerNameWithIcon() + ": " + PRESS_ENTER_TO_CHAT);
}
} }
} }
void unlockChat() void unlockChat()
{ {
Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT); Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
if (chatboxParent != null) if (chatboxInput != null)
{ {
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); if (client.getGameState() == GameState.LOGGED_IN)
if (chatboxInput != null)
{ {
if (client.getGameState() == GameState.LOGGED_IN) final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
{ final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND;
final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor));
final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND;
chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor));
}
} }
} }
} }