Skip to content

Commit

Permalink
Abstracted away selection borders and scrollbar in ScrollableWidget
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechPizzaDev
TechPizzaDev committed Aug 24, 2023
1 parent f478fc4 commit cb852e8
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 60 deletions.
95 changes: 48 additions & 47 deletions src/main/java/dev/adventurecraft/awakening/common/ScrollableWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public abstract class ScrollableWidget extends GuiElement {
private final int scrollBackRight;
private final int scrollBackLeft;

private int scrollbarX = 124;
private int scrollbarWidth = 6;
private int field_1533;
private int field_1534;
private double dragDistance = -2.0;
Expand Down Expand Up @@ -63,16 +65,14 @@ protected int getTotalRenderHeight() {
return this.getEntryCount() * this.entryHeight + this.contentTopPadding;
}

protected abstract void renderBackground();

protected abstract void renderEntry(
int entryIndex, double entryX, double entryY, int entryHeight, Tessellator tessellator);

protected boolean mouseClicked(int entryX, int entryY) {
protected boolean mouseClicked(int mouseX, int mouseY) {
return false;
}

protected void beforeRender(double x, double y, Tessellator tessellator) {
protected void beforeEntryRender(double x, double y, Tessellator tessellator) {
}

protected void afterRender(int mouseX, int mouseY, float tickTime, Tessellator tessellator) {
Expand All @@ -82,17 +82,17 @@ public void setContentTopPadding(int value) {
this.contentTopPadding = value;
}

public void setScrollbarSize(int x, int width) {
this.scrollbarX = x;
this.scrollbarWidth = width;
}

public int getEntryUnderPoint(int x, int y) {
int center = this.width / 2 + this.widgetX;
int left = center - 110;
int right = center + 110;
if (x >= left && x <= right) {
int entryY = y - this.contentTop - this.contentTopPadding + (int) this.scrollY - 4 - this.widgetY;
if (entryY >= 0) {
int entryIndex = entryY / this.entryHeight;
if (entryIndex >= 0 && entryIndex < this.getEntryCount()) {
return entryIndex;
}
int entryY = y - this.contentTop - this.contentTopPadding + (int) this.scrollY - this.widgetY;
if (entryY >= 0) {
int entryIndex = entryY / this.entryHeight;
if (entryIndex >= 0 && entryIndex < this.getEntryCount()) {
return entryIndex;
}
}
return -1;
Expand All @@ -110,7 +110,7 @@ public void moveContent(double amount) {

if (!this.isUsingScrollbar && this.isScrolling) {
// Drag with more and more friction
double maxY = this.getTotalRenderHeight() - (this.contentBot - this.contentTop - 4);
double maxY = this.getTotalRenderHeight() - (this.contentBot - this.contentTop);
if (maxY < 0) {
maxY /= 2;
}
Expand All @@ -129,7 +129,7 @@ public void moveContent(double amount) {
}

private double clampTargetScroll(double value, double totalHeight) {
double maxY = totalHeight - (this.contentBot - this.contentTop - 4);
double maxY = totalHeight - (this.contentBot - this.contentTop);
if (maxY < 0) {
maxY /= 2;
}
Expand Down Expand Up @@ -167,11 +167,10 @@ public void onMouseEvent() {
}

public void render(int mouseX, int mouseY, float tickTime) {
this.renderBackground();
int entryCount = this.getEntryCount();
int center = this.width / 2 + this.widgetX;
int scrollBarLeft = center + 124;
int scrollBarRight = scrollBarLeft + 6;
int scrollBarLeft = center + this.scrollbarX;
int scrollBarRight = scrollBarLeft + this.scrollbarWidth;

int scrollBackLeft = this.scrollBackLeft + this.widgetX;
int scrollBackRight = this.scrollBackRight + this.widgetX;
Expand All @@ -192,35 +191,30 @@ public void render(int mouseX, int mouseY, float tickTime) {
if (this.dragDistance == -1.0) {
boolean doDragging = true;
if (mouseY >= contentTop && mouseY <= contentBot) {
int entryLeft = center - 110;
int entryRight = center + 110;
if (mouseX >= entryLeft && mouseX <= entryRight) {
int hoverY = mouseY - contentTop - this.contentTopPadding + (int) this.scrollY - 4;
int entryIndex = hoverY / this.entryHeight;
if (entryIndex >= 0 && hoverY >= 0 && entryIndex < entryCount) {
boolean doubleClick = entryIndex == this.prevEntryIndex && System.currentTimeMillis() - this.prevClickTime < 250L;
this.entryClicked(entryIndex, doubleClick);
this.prevEntryIndex = entryIndex;
this.prevClickTime = System.currentTimeMillis();
} else if (hoverY < 0) {
if (this.mouseClicked(mouseX - entryLeft, mouseY - contentTop + (int) this.scrollY - 4)) {
doDragging = false;
}
int entryIndex = this.getEntryUnderPoint(mouseX, mouseY);
if (entryIndex != -1) {
boolean doubleClick = entryIndex == this.prevEntryIndex && System.currentTimeMillis() - this.prevClickTime < 250L;
this.entryClicked(entryIndex, doubleClick);
this.prevEntryIndex = entryIndex;
this.prevClickTime = System.currentTimeMillis();
} else {
if (this.mouseClicked(mouseX, mouseY)) {
doDragging = false;
}
}

if (mouseX >= scrollBarLeft && mouseX <= scrollBarRight) {
if (this.scrollbarWidth > 0 && mouseX >= scrollBarLeft && mouseX <= scrollBarRight) {
this.scrollAmount = -1.0;
int n3 = totalHeight - (contentBot - contentTop - 4);
int n3 = totalHeight - (contentBot - contentTop);
if (n3 < 1) {
n3 = 1;
}
int n2 = (int) Math.ceil((double) ((contentBot - contentTop) * (contentBot - contentTop)) / (double) totalHeight);
if (n2 < 32) {
n2 = 32;
}
if (n2 > contentBot - contentTop - 8) {
n2 = contentBot - contentTop - 8;
if (n2 > contentBot - contentTop) {
n2 = contentBot - contentTop;
}
this.scrollAmount /= (double) (contentBot - contentTop - n2) / (double) n3;
this.isUsingScrollbar = true;
Expand Down Expand Up @@ -259,17 +253,16 @@ public void render(int mouseX, int mouseY, float tickTime) {
var ts = Tessellator.INSTANCE;
this.renderContentBackground(scrollBackLeft, scrollBackRight, contentTop, contentBot, this.scrollY, ts);

double entryBaseX = center - 92 - 16;
double entryBaseY = contentTop + 4 - this.scrollY;
this.beforeRender(entryBaseX, entryBaseY, ts);
double entryBaseX = center;
double entryBaseY = contentTop - this.scrollY;
this.beforeEntryRender(entryBaseX, entryBaseY, ts);

for (int entryIndex = 0; entryIndex < entryCount; ++entryIndex) {
double entryY = entryBaseY + entryIndex * this.entryHeight + this.contentTopPadding;
int entryContentHeight = this.entryHeight - 4;
if (entryY > contentBot || entryY + entryContentHeight < contentTop) {
if (entryY > contentBot || entryY + this.entryHeight < contentTop) {
continue;
}
this.renderEntry(entryIndex, entryBaseX, entryY, entryContentHeight, ts);
this.renderEntry(entryIndex, entryBaseX, entryY, this.entryHeight, ts);
}
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glEnable(GL11.GL_BLEND);
Expand Down Expand Up @@ -301,15 +294,15 @@ public void render(int mouseX, int mouseY, float tickTime) {
ts.vertex(scrollBackLeft, contentBot - n4, 0.0, 0.0, 0.0);
ts.tessellate();

int n3 = totalHeight - (contentBot - contentTop - 4);
if (n3 > 0) {
int n3 = totalHeight - (contentBot - contentTop);
if (this.scrollbarWidth > 0 && n3 > 0) {
// Scrollbar rendering
int n2 = (contentBot - contentTop) * (contentBot - contentTop) / totalHeight;
if (n2 < 32) {
n2 = 32;
}
if (n2 > contentBot - contentTop - 8) {
n2 = contentBot - contentTop - 8;
if (n2 > contentBot - contentTop) {
n2 = contentBot - contentTop;
}
int n = (int) this.clampTargetScroll(this.targetScrollY, totalHeight) * (contentBot - contentTop - n2) / n3 + contentTop;
if (n < contentTop) {
Expand Down Expand Up @@ -387,4 +380,12 @@ public void renderContentSelection(
ts.vertex(right - borderThickness, y - borderThickness, 0.0, 1.0, 0.0);
ts.vertex(left + borderThickness, y - borderThickness, 0.0, 0.0, 0.0);
}

public int getContentTopPadding() {
return this.contentTopPadding;
}

public double getScrollY() {
return this.scrollY;
}
}
4 changes: 3 additions & 1 deletion ...ain/java/dev/adventurecraft/awakening/mixin/client/gui/screen/MixinSelectWorldScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ private void disableOpenScreen(Minecraft instance, Screen screen) {

@Override
public void onMouseEvent() {
((ExScrollableBaseWidget) this.worldList).onMouseEvent();
super.onMouseEvent();
if (this.worldList instanceof ExScrollableBaseWidget scrollable) {
scrollable.onMouseEvent();
}
}
}
4 changes: 3 additions & 1 deletion ...in/java/dev/adventurecraft/awakening/mixin/client/gui/screen/ingame/MixinStatsScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ public abstract class MixinStatsScreen extends Screen {

@Override
public void onMouseEvent() {
((ExScrollableBaseWidget) this.generalTabBase).onMouseEvent();
super.onMouseEvent();
if (this.generalTabBase instanceof ExScrollableBaseWidget scrollable) {
scrollable.onMouseEvent();
}
}
}
50 changes: 39 additions & 11 deletions .../java/dev/adventurecraft/awakening/mixin/client/gui/widget/MixinScrollableBaseWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,42 +51,70 @@ protected void entryClicked(int entryIndex, boolean doubleClick) {
}

@Override
protected boolean mouseClicked(int x, int y) {
self.mouseClicked(x, y);
public int getEntryUnderPoint(int x, int y) {
int center = this.width / 2 + this.widgetX;
int left = center - 110;
int right = center + 110;
if (x >= left && x <= right) {
int entryY = y - this.contentTop - this.getContentTopPadding() + (int) this.getScrollY() - 4 - this.widgetY;
if (entryY >= 0) {
int entryIndex = entryY / this.entryHeight;
if (entryIndex >= 0 && entryIndex < this.getEntryCount()) {
return entryIndex;
}
}
}
return -1;
}

@Override
protected boolean mouseClicked(int mouseX, int mouseY) {
int contentTop = this.contentTop + this.widgetY;
int scrollY = (int) this.getScrollY();
int entryLeft = mouseX - (this.width / 2 + this.widgetX - 110);
int entryTop = mouseY - contentTop + scrollY - 4;
int hoverY = mouseY - contentTop - this.getContentTopPadding() + scrollY - 4;
if (hoverY <= 0) {
self.mouseClicked(entryLeft, entryTop);
}
return false;
}

@Override
protected int getTotalRenderHeight() {
return self.getTotalRenderHeight();
return self.getTotalRenderHeight() + 4;
}

@Override
protected void renderBackground() {
protected void renderContentBackground(
double left, double right, double top, double bot, double scroll, Tessellator ts) {
self.renderBackground();
super.renderContentBackground(left, right, top, bot, scroll, ts);
}

@Override
protected void renderEntry(int entryIndex, double entryX, double entryY, int entryHeight, Tessellator ts) {
int x = (int) Math.floor(entryX);
int y = (int) Math.floor(entryY);
int x = (int) Math.floor(entryX) - 92 - 16;
int y = (int) Math.floor(entryY) + 4;
int height = entryHeight - 4;

if (self.renderSelections && self.isWorldSelected(entryIndex)) {
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
GL11.glDisable(GL11.GL_TEXTURE_2D);
ts.start();
self.rootWidget.renderContentSelection(
x - 2, y, 220, entryHeight, 1, 0x808080, 0, ts);
x - 2, y, 220, height, 1, 0x808080, 0, ts);
ts.tessellate();
GL11.glEnable(GL11.GL_TEXTURE_2D);
}
self.renderStatEntry(entryIndex, x, y, entryHeight, ts);
self.renderStatEntry(entryIndex, x, y, height, ts);
}

@Override
protected void beforeRender(double x, double y, Tessellator ts) {
protected void beforeEntryRender(double x, double y, Tessellator ts) {
if (self.doRenderStatItemSlot) {
int sX = (int) Math.floor(x);
int sY = (int) Math.floor(y);
int sX = (int) Math.floor(x) - 92 - 16;
int sY = (int) Math.floor(y) + 4;
self.renderStatItemSlot(sX, sY, ts);
}
}
Expand Down

0 comments on commit cb852e8

Please sign in to comment.