Fix config overriding, fix buttons

This commit is contained in:
Surya 2021-05-30 23:47:43 +05:30
parent 30ee79b7c0
commit bec6906b7e
4 changed files with 5 additions and 6 deletions

View File

@ -115,7 +115,6 @@ class ListViewHandler extends ViewHandlerBase<Void> {
this.pingButton = new WButton(new LiteralText("")); this.pingButton = new WButton(new LiteralText(""));
this.detailButton = new WButton(new LiteralText("")); this.detailButton = new WButton(new LiteralText(""));
this.deleteButton.setIcon(ResourceUtils.CreateCloseIcon());
this.pingButton.setIcon(ResourceUtils.CreatePingIcon()); this.pingButton.setIcon(ResourceUtils.CreatePingIcon());
this.detailButton.setIcon(ResourceUtils.CreateDetailsIcon()); this.detailButton.setIcon(ResourceUtils.CreateDetailsIcon());
@ -124,8 +123,8 @@ class ListViewHandler extends ViewHandlerBase<Void> {
this.add(location, 4 * 18, 0, 4 * 18, 1 * 18); this.add(location, 4 * 18, 0, 4 * 18, 1 * 18);
this.add(coordinates, 3 * 18, 1 * 18, 9 * 18, 1 * 18); this.add(coordinates, 3 * 18, 1 * 18, 9 * 18, 1 * 18);
this.add(deleteButton, 13 * 18, 0, 1 * 18, 1 * 18); this.add(deleteButton, 13 * 18, 0, 1 * 18, 1 * 18);
this.add(pingButton, 1 * 18, 1 * 18, 1 * 18, 1 * 18); this.add(pingButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18);
this.add(detailButton, 11 * 18, 0, 1 * 18, 1 * 18); this.add(detailButton, 12 * 18 - 1, 0, 1 * 18, 1 * 18);
this.icon.setSize(1 * 15, 1 * 15); this.icon.setSize(1 * 15, 1 * 15);
this.world.setSize(3 * 18, 1 * 18); this.world.setSize(3 * 18, 1 * 18);

View File

@ -24,8 +24,7 @@ public class TexturedButton extends WButton {
super.paint(matrices, x, y, mouseX, mouseY); super.paint(matrices, x, y, mouseX, mouseY);
if (texture != null) { if (texture != null) {
ScreenDrawing.texturedGuiRect(matrices, x + 1, y + 1, getWidth() - 2, getHeight() - 2, texture, -1, -1, ScreenDrawing.texturedGuiRect(matrices, x + 2, y + 2, 14, 16, texture, 0, 0, 0xFFFFFF);
0xFFFFFF);
} }
if (getLabel() != null) { if (getLabel() != null) {

View File

@ -28,7 +28,8 @@ class KeyBindConfiguration implements IKeyBindConfiguration {
@Override @Override
public void setDefaultKeyBinding(int keyCode) { public void setDefaultKeyBinding(int keyCode) {
defaultKeyBinding = createKeyBinding(keyCode); defaultKeyBinding.setBoundKey(InputUtil.Type.KEYSYM.createFromCode(keyCode));
KeyBinding.updateKeysByCode();
} }
private KeyBinding createDefaultKeyBinding(IFileStore fileStore) throws IOException { private KeyBinding createDefaultKeyBinding(IFileStore fileStore) throws IOException {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 183 B