PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 07:17:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update kirin

Browse source
This commit is contained in:
Sollace 2022-09-04 15:44:57 +02:00
parent 95e487ad1b
commit 184af1d53e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -17,4 +17,4 @@ org.gradle.daemon=false
# Dependencies # Dependencies
modmenu_version=4.0.6 modmenu_version=4.0.6
minelp_version=4.6.1 minelp_version=4.6.1
kirin_version=1.11.0 kirin_version=1.11.1

6
src/main/java/com/minelittlepony/unicopia/container/DynamicContent.java
View file

@ -96,7 +96,7 @@ public class DynamicContent implements Content {
return (bounds.width - 10) - elements.stream() return (bounds.width - 10) - elements.stream()
.filter(PageElement::isFloating) .filter(PageElement::isFloating)
.map(PageElement::bounds) .map(PageElement::bounds)
.filter(b -> b.contains(b.left + b.width / 2, yPosition)) .filter(b -> b.containsY(yPosition))
.mapToInt(b -> b.width) .mapToInt(b -> b.width)
.sum(); .sum();
} }
@ -105,7 +105,7 @@ public class DynamicContent implements Content {
return elements.stream() return elements.stream()
.filter(p -> p.flow() == PageElement.Flow.LEFT) .filter(p -> p.flow() == PageElement.Flow.LEFT)
.map(PageElement::bounds) .map(PageElement::bounds)
.filter(b -> b.contains(b.left + b.width / 2, yPosition)) .filter(b -> b.containsY(yPosition))
.mapToInt(b -> b.width) .mapToInt(b -> b.width)
.sum(); .sum();
} }
@ -150,7 +150,7 @@ public class DynamicContent implements Content {
elements.stream().filter(PageElement::isFloating).forEach(element -> { elements.stream().filter(PageElement::isFloating).forEach(element -> {
Bounds bounds = element.bounds(); Bounds bounds = element.bounds();
matrices.push(); matrices.push();
matrices.translate(bounds.left, bounds.top, 0); bounds.translate(matrices);
element.draw(matrices, mouseX, mouseY, container); element.draw(matrices, mouseX, mouseY, container);
matrices.pop(); matrices.pop();
}); });