JfMods/LibJF
JfMods/LibJF
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(resource-pack-entry-widgets): respect scrollbar
All checks were successful
ci/woodpecker/push/docs Pipeline was successful
Details
ci/woodpecker/push/jfmod Pipeline was successful
Details

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2024-07-18 22:36:49 +02:00
parent b0a996c4f4
commit 0be3b7812e
Signed by: Johannes
GPG Key ID: E76429612C2929F4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjf-resource-pack-entry-widgets-v0/src/client/java/io/gitlab/jfronny/libjf/entrywidgets/impl/mixin/ResourcePackEntryMixin.java
View File

@ -18,6 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
public abstract class ResourcePackEntryMixin { public abstract class ResourcePackEntryMixin {
@Shadow protected abstract boolean isSelectable(); @Shadow protected abstract boolean isSelectable();
@Shadow @Final private ResourcePackOrganizer.Pack pack; @Shadow @Final private ResourcePackOrganizer.Pack pack;
@Shadow @Final private PackListWidget widget;
@Unique int libjf$selected = -1; @Unique int libjf$selected = -1;
@Unique private Boolean fold; @Unique private Boolean fold;
@Unique int libjf$foldTicks = 0; @Unique int libjf$foldTicks = 0;
@ -26,11 +27,11 @@ public abstract class ResourcePackEntryMixin {
@Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/client/gui/DrawContext;IIIIIIIZF)V") @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/client/gui/DrawContext;IIIIIIIZF)V")
private void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo info) { private void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo info) {
int prevMargin = 0; int prevMargin = 0;
int deltaX = 2; int deltaX = 2 + (widget.getMaxScroll() > 0 ? 6 : 0);
boolean selectable = isSelectable(); boolean selectable = isSelectable();
libjf$selected = -1; libjf$selected = -1;
if (libjf$foldTicks == maxFoldTicks) { if (libjf$foldTicks == maxFoldTicks) {
context.drawGuiTexture(Identifier.ofVanilla("transferable_list/unselect"), x + entryWidth - 20, y + entryWidth / 20 - 16, 16, 32); context.drawGuiTexture(Identifier.ofVanilla("transferable_list/unselect"), x + entryWidth - 16 - deltaX, y + entryWidth / 20 - 16, 16, 32);
} else { } else {
for (int i = 0; i < ResourcePackEntryWidget.WIDGETS.size(); i++) { for (int i = 0; i < ResourcePackEntryWidget.WIDGETS.size(); i++) {
ResourcePackEntryWidget widget = ResourcePackEntryWidget.WIDGETS.get(i); ResourcePackEntryWidget widget = ResourcePackEntryWidget.WIDGETS.get(i);
@ -47,7 +48,7 @@ public abstract class ResourcePackEntryMixin {
prevMargin = widget.getXMargin(pack); prevMargin = widget.getXMargin(pack);
} }
} }
if (fold == null) fold = deltaX > 42; // set only once to prevent flickering if (fold == null) fold = deltaX > 48; // set only once to prevent flickering
if (!fold) return; if (!fold) return;
int mouseRange = Math.max(10, deltaX) + 40; int mouseRange = Math.max(10, deltaX) + 40;
if (mouseX >= x + entryWidth - mouseRange && mouseX <= x + entryWidth && mouseY <= y + entryHeight && mouseY >= y) libjf$foldTicks = Math.max(libjf$foldTicks - 1, 0); if (mouseX >= x + entryWidth - mouseRange && mouseX <= x + entryWidth && mouseY <= y + entryHeight && mouseY >= y) libjf$foldTicks = Math.max(libjf$foldTicks - 1, 0);