Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-24 12:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:d8122ae7e27729df911c844e44bb5c0349e28963
Branches Tags
Ellpeck:main
Ellpeck:1.20
Ellpeck:1.18
Ellpeck:1.19
Ellpeck:1.16
Ellpeck:crafter
Ellpeck:1.15
Ellpeck:1.18.1
...
compare: Ellpeck:f8b618a1d24dd5ea960f3f74fd18144f7fc1bab2
Branches Tags
Ellpeck:main
Ellpeck:1.20
Ellpeck:1.18
Ellpeck:1.19
Ellpeck:1.16
Ellpeck:crafter
Ellpeck:1.15
Ellpeck:1.18.1

2 commits
d8122ae7e2 ... f8b618a1d2

Author SHA1 Message Date
Ell
f8b618a1d2
Merge pull request #93 from dannydjdk/main 
Item Terminal Tab Order and Right Clicking
 2021-08-24 20:28:51 +02:00
danny
405550efe9 -Reordered widget init order in Item Terminal to set search field as first in tab order. (Addresses ##80) 
-Clear text from search field on right-click. (Addresses #91)
 2021-08-14 23:40:16 -05:00
1 changed files with 12 additions and 5 deletions
Show stats Expand all files Collapse all files

17
src/main/java/de/ellpeck/prettypipes/terminal/containers/ItemTerminalGui.java
View file

@ -59,6 +59,13 @@ public class ItemTerminalGui extends ContainerScreen<ItemTerminalContainer> {
@Override @Override
protected void init() { protected void init() {
super.init(); super.init();
this.search = this.addButton(new TextFieldWidget(this.font, this.guiLeft + this.getXOffset() + 97, this.guiTop + 6, 86, 8, new StringTextComponent("")));
this.search.setEnableBackgroundDrawing(false);
this.lastSearchText = "";
if (this.items != null)
this.updateWidgets();
this.plusButton = this.addButton(new Button(this.guiLeft + this.getXOffset() + 95 - 7 + 12, this.guiTop + 103, 12, 12, new StringTextComponent("+"), button -> { this.plusButton = this.addButton(new Button(this.guiLeft + this.getXOffset() + 95 - 7 + 12, this.guiTop + 103, 12, 12, new StringTextComponent("+"), button -> {
int modifier = requestModifier(); int modifier = requestModifier();
if (modifier > 1 && this.requestAmount == 1) { if (modifier > 1 && this.requestAmount == 1) {
@ -109,11 +116,6 @@ public class ItemTerminalGui extends ContainerScreen<ItemTerminalContainer> {
for (int x = 0; x < 9; x++) for (int x = 0; x < 9; x++)
this.addButton(new ItemTerminalWidget(this.guiLeft + this.getXOffset() + 8 + x * 18, this.guiTop + 18 + y * 18, x, y, this)); this.addButton(new ItemTerminalWidget(this.guiLeft + this.getXOffset() + 8 + x * 18, this.guiTop + 18 + y * 18, x, y, this));
} }
this.search = this.addButton(new TextFieldWidget(this.font, this.guiLeft + this.getXOffset() + 97, this.guiTop + 6, 86, 8, new StringTextComponent("")));
this.search.setEnableBackgroundDrawing(false);
this.lastSearchText = "";
if (this.items != null)
this.updateWidgets();
} }
protected int getXOffset() { protected int getXOffset() {
@ -159,6 +161,11 @@ public class ItemTerminalGui extends ContainerScreen<ItemTerminalContainer> {
} }
if (button == 0) if (button == 0)
this.isScrolling = false; this.isScrolling = false;
else if (button == 1 && mouseX >= this.search.x && mouseX <= this.search.x + this.search.getWidth() && mouseY >= this.search.y && mouseY <= this.search.y + 8) {
//clear text from search field when letting go of right mouse button within search field
this.search.setText("");
return true;
}
return super.mouseReleased(mouseX, mouseY, button); return super.mouseReleased(mouseX, mouseY, button);
} }