From 5a95a340cc6fc5d42ef45d067c94a83f08ad0846 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 2 May 2018 22:00:45 +0200 Subject: [PATCH] Verify game's minimum size Due to some race condition, we can't really rely on applet's minimum size, so add verification for minimum size when size is changed. Fixes: #2261 Signed-off-by: Tomas Slusny --- .../java/net/runelite/client/ui/ClientUI.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index e6aa0e1a1f..de848eb318 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -55,6 +55,7 @@ import javax.swing.SwingUtilities; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; +import net.runelite.api.Constants; import net.runelite.api.GameState; import net.runelite.api.Point; import net.runelite.api.events.ConfigChanged; @@ -201,22 +202,10 @@ public class ClientUI return; } - int width = config.gameSize().width; - int height = config.gameSize().height; - // The upper bounds are defined by the applet's max size - // The lower bounds are taken care of by ClientPanel's setMinimumSize - - if (width > 7680) - { - width = 7680; - } - - if (height > 2160) - { - height = 2160; - } - + // The lower bounds are defined by the client's fixed size + int width = Math.max(Math.min(config.gameSize().width, 7680), Constants.GAME_FIXED_WIDTH); + int height = Math.max(Math.min(config.gameSize().height, 2160), Constants.GAME_FIXED_HEIGHT); final Dimension size = new Dimension(width, height); client.setSize(size);