dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Grid crash with search field, fixes #1410

Browse Source
This commit is contained in:
raoulvdberge
2017-08-09 10:40:48 +02:00
parent 4f168c8a82
commit 8f00b4cc73
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -539,23 +539,25 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException {
super.mouseClicked(mouseX, mouseY, clickedButton);
boolean wasSearchFieldFocused = searchField.isFocused();
searchField.mouseClicked(mouseX, mouseY, clickedButton);
if (tabHovering >= 0 && tabHovering < grid.getTabs().size()) {
grid.onTabSelectionChanged(tabHovering);
}
if (clickedButton == 1 && inBounds(79, 5 + getTabDelta(), 90, 12, mouseX - guiLeft, mouseY - guiTop)) {
searchField.setText("");
searchField.setFocused(true);
if (searchField != null) {
boolean wasSearchFieldFocused = searchField.isFocused();
sortItems();
searchField.mouseClicked(mouseX, mouseY, clickedButton);
updateJEI();
} else if (wasSearchFieldFocused != searchField.isFocused()) {
saveHistory();
if (clickedButton == 1 && inBounds(79, 5 + getTabDelta(), 90, 12, mouseX - guiLeft, mouseY - guiTop)) {
searchField.setText("");
searchField.setFocused(true);
sortItems();
updateJEI();
} else if (wasSearchFieldFocused != searchField.isFocused()) {
saveHistory();
}
}
boolean clickedClear = clickedButton == 0 && isOverClear(mouseX - guiLeft, mouseY - guiTop);