From 801200028a61da1ada3611dbfbdd6b63b1fb4a2e Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sun, 11 Oct 2015 17:45:23 +0200 Subject: [PATCH] setMinSize should not strictly override calcMinSize --- .../minecraft/gui/element/AbstractGuiElement.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java index cdc66592..1aa93307 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiElement.java @@ -155,7 +155,19 @@ public abstract class AbstractGuiElement> 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();