From f149b554c783e9a1ac03b74dd13a9a7297b9ca42 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 5 Nov 2018 19:58:18 -0700 Subject: [PATCH] runelite-client: Don't check if customChrome is enabled after startup This value is locked in at startup, the config value is irrelevant to what should actually be happening --- .../main/java/net/runelite/client/ui/ClientUI.java | 10 +++++----- .../java/net/runelite/client/util/SwingUtil.java | 13 ------------- 2 files changed, 5 insertions(+), 18 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 04017b3a42..912e7e6941 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 @@ -127,6 +127,7 @@ public class ClientUI private final Provider clientThreadProvider; private final CardLayout cardLayout = new CardLayout(); private final Rectangle sidebarButtonPosition = new Rectangle(); + private boolean withTitleBar; private ContainableFrame frame; private JPanel navContainer; private PluginPanel pluginPanel; @@ -179,8 +180,7 @@ public class ClientUI { final NavigationButton navigationButton = event.getButton(); final PluginPanel pluginPanel = navigationButton.getPanel(); - final boolean inTitle = !event.getButton().isTab() && - (config.enableCustomChrome() || SwingUtil.isCustomTitlePanePresent(frame)); + final boolean inTitle = !event.getButton().isTab() && withTitleBar; final int iconSize = 16; if (pluginPanel != null) @@ -382,7 +382,7 @@ public class ClientUI mouseManager.registerMouseListener(mouseListener); // Decorate window with custom chrome and titlebar if needed - final boolean withTitleBar = config.enableCustomChrome(); + withTitleBar = config.enableCustomChrome(); frame.setUndecorated(withTitleBar); if (withTitleBar) @@ -618,7 +618,7 @@ public class ClientUI */ public void paintOverlays(final Graphics2D graphics) { - if (!(client instanceof Client) || config.enableCustomChrome()) + if (!(client instanceof Client) || withTitleBar) { return; } @@ -807,7 +807,7 @@ public class ClientUI } frame.setExpandResizeType(config.automaticResizeType()); - frame.setContainedInScreen(config.containInScreen() && config.enableCustomChrome()); + frame.setContainedInScreen(config.containInScreen() && withTitleBar); if (!config.rememberScreenBounds()) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index 7caa72308a..39fc738f1f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -31,7 +31,6 @@ import java.awt.Frame; import java.awt.Image; import java.awt.SystemTray; import java.awt.TrayIcon; -import java.awt.Window; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; @@ -59,7 +58,6 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.components.CustomScrollBarUI; import org.pushingpixels.substance.internal.SubstanceSynapse; -import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities; /** * Various Swing utilities. @@ -279,15 +277,4 @@ public class SwingUtil navigationButton.setOnSelect(button::doClick); return button; } - - /** - * Checks if custom substance title pane is present. - * - * @param frame the parent frame - * @return true if title pane is present - */ - public static boolean isCustomTitlePanePresent(final Window frame) - { - return SubstanceCoreUtilities.getTitlePaneComponent(frame) != null; - } }