Skip to content

Fix items not clickable in the crafting station #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 31, 2021
Merged

Fix items not clickable in the crafting station #1629

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe74783
Add vanilla dusts to dustRegular
warjort May 27, 2021
ad872d2
Revert "Add vanilla dusts to dustRegular"
warjort May 27, 2021
43a2283
A widget should be clickable if any of its corners are in the scrolla…
warjort May 28, 2021
54aaa3b
Fix bottom and right coords for scissor checking
warjort May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/main/java/gregtech/api/gui/widgets/ScrollableListWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,34 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) {
super.drawInBackground(finalMouseX, finalMouseY, context));
}

@Override
public boolean isWidgetClickable(final Widget widget) {
if (!super.isWidgetClickable(widget)) {
return false;
}
return isBoxInsideScissor(widget.toRectangleBox());
return isWidgetOverlapsScissor(widget);
}

private boolean isPositionInsideScissor(int mouseX, int mouseY) {
return isMouseOverElement(mouseX, mouseY) && !isOnScrollPane(mouseX, mouseY);
}

private boolean isWidgetOverlapsScissor(Widget widget) {
final Position position = widget.getPosition();
final Size size = widget.getSize();
final int x0 = position.x;
final int y0 = position.y;
final int x1 = position.x + size.width - 1;
final int y1 = position.y + size.height - 1;
return isPositionInsideScissor(x0, y0) ||
isPositionInsideScissor(x0, y1) ||
isPositionInsideScissor(x1, y0) ||
isPositionInsideScissor(x1, y1);
}

private boolean isBoxInsideScissor(Rectangle rectangle) {
return isPositionInsideScissor(rectangle.x, rectangle.y) &&
isPositionInsideScissor(rectangle.x + rectangle.width, rectangle.y + rectangle.height);
isPositionInsideScissor(rectangle.x + rectangle.width - 1, rectangle.y + rectangle.height - 1);
}

@Override
Expand Down