DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setMinSize should not strictly override calcMinSize

Browse Source
This commit is contained in:
johni0702
2015-10-11 17:45:23 +02:00
parent 4dfc2720a6
commit 801200028a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java
View File

@@ -155,7 +155,19 @@ public abstract class AbstractGuiElement<T extends AbstractGuiElement<T>> implem
@Override
public ReadableDimension getMinSize() {
return minSize == null ? calcMinSize() : minSize;
ReadableDimension calcSize = calcMinSize();
if (minSize == null) {
return calcSize;
} else {
if (minSize.getWidth() >= calcSize.getWidth() && minSize.getHeight() >= calcSize.getHeight()) {
return minSize;
} else {
return new Dimension(
Math.max(calcSize.getWidth(), minSize.getWidth()),
Math.max(calcSize.getHeight(), minSize.getHeight())
);
}
}
}
protected abstract ReadableDimension calcMinSize();