Skip to content

Commit 72ebeac

Browse files
Add horizontal scroll and fix list height (#271)
1 parent 8da7073 commit 72ebeac

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/main/java/dev/isxander/yacl3/gui/ElementListWidgetExt.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import net.minecraft.client.gui.navigation.ScreenRectangle;
1212
import net.minecraft.util.Mth;
1313
import org.jetbrains.annotations.Nullable;
14-
import org.lwjgl.glfw.GLFW;
1514

1615
import java.util.function.Consumer;
1716

@@ -70,13 +69,12 @@ protected int scrollBarY() {
7069
}
7170
*///?}
7271

73-
//? if >=1.21.6 {
74-
75-
/*@Override
72+
//? if >=1.21.5 {
73+
@Override
7674
public int maxScrollAmount() {
7775
return super.maxScrollAmount() + 5;
7876
}
79-
*///?}
77+
//?}
8078

8179
@Override
8280
public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
@@ -203,7 +201,7 @@ protected int getMaxPosition() {
203201
@Override
204202
protected int contentHeight() {
205203
//?}
206-
return children().stream().map(E::getItemHeight).reduce(0, Integer::sum) + headerHeight;
204+
return children().stream().mapToInt(E::getItemHeight).sum() + headerHeight;
207205
}
208206

209207
@Override

src/main/java/dev/isxander/yacl3/gui/tab/ScrollableNavigationBar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
8686

8787
@Override
8888
public boolean mouseScrolled(double mouseX, double mouseY, double horizontal, double vertical) {
89-
this.setScrollOffset(this.scrollOffset - (int)(vertical*15));
89+
this.setScrollOffset(this.scrollOffset - (int) (vertical * 15) - (int) (horizontal * 15));
9090
return true;
9191
}
9292

0 commit comments

Comments
 (0)