Skip to content

Avoid consuming scroll event if mouse is in exclusion area #222

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

Open
ZZZank wants to merge 4 commits into
base: cleanroom
Choose a base branch
from
+19 −4
Open

Avoid consuming scroll event if mouse is in exclusion area #222

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85479a1
add exclusion area check to `LeftAreaDispatcher`
ZZZank Jul 14, 2026
0fe4102
add exclusion area check to `IngredientListOverlay`
ZZZank Jul 14, 2026
54767bb
skip scroll handler if mouse is not over it
ZZZank Jul 14, 2026
7a55e9f
extract exclusion area check
ZZZank Jul 17, 2026
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
12 changes: 8 additions & 4 deletions src/main/java/mezz/jei/gui/overlay/IngredientListOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,19 @@ public void handleTick() {

@Override
public boolean isMouseOver(int mouseX, int mouseY) {
boolean result;
if (isListDisplayed()) {
if (Config.isCenterSearchBarEnabled() && searchField.isMouseOver(mouseX, mouseY)) {
return true;
result = true;
} else {
result = displayArea.contains(mouseX, mouseY);
}
return displayArea.contains(mouseX, mouseY);
} else if (this.guiProperties != null) {
return this.configButton.isMouseOver(mouseX, mouseY);
result = this.configButton.isMouseOver(mouseX, mouseY);
} else {
result = false;
}
return false;
return result && !guiScreenHelper.isInGuiExclusionArea(mouseX, mouseY);
Comment thread
ZZZank marked this conversation as resolved.
Outdated
}

@Override
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/mezz/jei/gui/overlay/bookmarks/LeftAreaDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,12 @@ public boolean canSetFocusWithMouse() {
return false;
}

public boolean isMouseOver(int mouseX, int mouseY) {
return canShow && hasContent() && !guiScreenHelper.isInGuiExclusionArea(mouseX, mouseY);
}

public boolean handleMouseScrolled(int mouseX, int mouseY, int dWheel) {
if (canShow && hasContent()) {
if (isMouseOver(mouseX, mouseY)) {
if (displayArea.contains(mouseX, mouseY)) {
return contents.get(current).handleMouseScrolled(mouseX, mouseY, dWheel);
} else if (naviArea.contains(mouseX, mouseY)) {
Expand All @@ -140,7 +144,7 @@ public boolean handleMouseScrolled(int mouseX, int mouseY, int dWheel) {
}

public boolean handleMouseClicked(int mouseX, int mouseY, int mouseButton) {
if (canShow && hasContent()) {
if (isMouseOver(mouseX, mouseY)) {
if (displayArea.contains(mouseX, mouseY)) {
return contents.get(current).handleMouseClicked(mouseX, mouseY, mouseButton);
} else if (naviArea.contains(mouseX, mouseY)) {
Expand All @@ -151,7 +155,7 @@ public boolean handleMouseClicked(int mouseX, int mouseY, int mouseButton) {
}

public boolean handleMouseReleased(int mouseX, int mouseY, int mouseButton) {
if (!(canShow || hasContent())) {
if (!isMouseOver(mouseX, mouseY)) {
return false;
}

Expand Down
10 changes: 9 additions & 1 deletion src/main/java/mezz/jei/input/InputHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,15 @@ private boolean handleMouseRelease(GuiScreen guiScreen, int mouseX, int mouseY)
}

private boolean handleMouseScroll(int dWheel, int mouseX, int mouseY) {
return ingredientListOverlay.handleMouseScrolled(mouseX, mouseY, dWheel) || leftAreaDispatcher.handleMouseScrolled(mouseX, mouseY, dWheel);
if (ingredientListOverlay.isMouseOver(mouseX, mouseY) && ingredientListOverlay.handleMouseScrolled(mouseX, mouseY, dWheel)) {
return true;
}

if (leftAreaDispatcher.isMouseOver(mouseX, mouseY) && leftAreaDispatcher.handleMouseScrolled(mouseX, mouseY, dWheel)) {
return true;
}

return false;
}

private boolean handleMouseClick(GuiScreen guiScreen, int mouseButton, int mouseX, int mouseY) {
Expand Down