MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Scrolling issue on Tabbed Screen

Browse source
This commit is contained in:
Frank 2022-07-20 00:54:14 +02:00
parent 8d0f312dc5
commit 7546efe097
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/org/betterx/bclib/client/gui/modmenu/TestScreen.java
View file

@ -27,13 +27,28 @@ public class TestScreen extends LayoutScreen {
protected LayoutComponent<?, ?> initContent() { protected LayoutComponent<?, ?> initContent() {
VerticalStack page1 = new VerticalStack(Value.fill(), Value.fit()); VerticalStack page1 = new VerticalStack(Value.fill(), Value.fit());
page1.addText(Value.fit(), Value.fit(), Component.literal("Page 1")).alignLeft().centerVertical(); page1.addText(Value.fit(), Value.fit(), Component.literal("Page 1")).alignLeft().centerVertical();
page1.addButton(Value.fit(), Value.fit(), Component.literal("A")).onPress((bt) -> System.out.println("A")) page1.addButton(Value.fit(), Value.fit(), Component.literal("A1")).onPress((bt) -> System.out.println("A1"))
.centerHorizontal(); .centerHorizontal();
page1.addButton(Value.fit(), Value.fit(), Component.literal("A2")).onPress((bt) -> System.out.println("A2"))
.centerHorizontal();
page1.addButton(Value.fit(), Value.fit(), Component.literal("A3")).onPress((bt) -> System.out.println("A3"))
.centerHorizontal();
page1.addButton(Value.fit(), Value.fit(), Component.literal("A4")).onPress((bt) -> System.out.println("A4"))
.centerHorizontal();
page1.addRange(Value.fixed(100), Value.fit(), Component.literal("N1"), 0, 10, 5);
VerticalStack page2 = new VerticalStack(Value.fill(), Value.fit()); VerticalStack page2 = new VerticalStack(Value.fill(), Value.fit());
page2.addText(Value.fit(), Value.fit(), Component.literal("Page 2")).alignRight().centerVertical(); page2.addText(Value.fit(), Value.fit(), Component.literal("Page 2")).alignRight().centerVertical();
page1.addButton(Value.fit(), Value.fit(), Component.literal("B")).onPress((bt) -> System.out.println("B")) page2.addButton(Value.fit(), Value.fit(), Component.literal("B1")).onPress((bt) -> System.out.println("B1"))
.centerHorizontal(); .centerHorizontal();
page2.addButton(Value.fit(), Value.fit(), Component.literal("B2")).onPress((bt) -> System.out.println("B2"))
.centerHorizontal();
page2.addButton(Value.fit(), Value.fit(), Component.literal("B3")).onPress((bt) -> System.out.println("B3"))
.centerHorizontal();
page2.addButton(Value.fit(), Value.fit(), Component.literal("B4")).onPress((bt) -> System.out.println("B4"))
.centerHorizontal();
page2.addRange(Value.fixed(100), Value.fit(), Component.literal("N2"), 0, 10, 5);
Container c = new Container(Value.fill(), Value.fixed(40)); Container c = new Container(Value.fill(), Value.fixed(40));
c.addChild(new Button(Value.fit(), Value.fit(), Component.literal("Containerd")).onPress(bt -> { c.addChild(new Button(Value.fit(), Value.fit(), Component.literal("Containerd")).onPress(bt -> {
@ -54,8 +69,14 @@ public class TestScreen extends LayoutScreen {
).centerHorizontal() ).centerHorizontal()
); );
rows.addHorizontalSeparator(16).alignTop(); rows.addHorizontalSeparator(16).alignTop();
rows.add(new Tabs(Value.fixed(300), Value.fit()).addPage(Component.literal("PAGE 1"), page1) rows.add(new Tabs(Value.fixed(300), Value.fixed(80)).addPage(
.addPage(Component.literal("PAGE 2"), page2)); Component.literal("PAGE 1"),
VerticalScroll.create(page1)
)
.addPage(
Component.literal("PAGE 2"),
VerticalScroll.create(page2)
));
rows.add(new Input(Value.fitOrFill(), Value.fit(), Component.literal("Input"), "0xff00ff")); rows.add(new Input(Value.fitOrFill(), Value.fit(), Component.literal("Input"), "0xff00ff"));
rows.add(new ColorSwatch(Value.fit(), Value.fit(), ColorUtil.LIGHT_PURPLE).centerHorizontal()); rows.add(new ColorSwatch(Value.fit(), Value.fit(), ColorUtil.LIGHT_PURPLE).centerHorizontal());
rows.add(new ColorPicker( rows.add(new ColorPicker(

7
src/main/java/org/betterx/ui/layout/components/Container.java
View file

@ -239,10 +239,13 @@ public class Container extends LayoutComponent<Container.ContainerRenderer, Cont
@Override @Override
public boolean isMouseOver(double x, double y) { public boolean isMouseOver(double x, double y) {
if (visible) { if (visible) {
boolean res = false;
for (var child : children) { for (var child : children) {
return child.isMouseOver(x, y); res |= child.isMouseOver(x, y);
} }
return res || relativeBounds.contains(x, y);
} }
return relativeBounds.contains(x, y); return false;
} }
} }