From f149b554c783e9a1ac03b74dd13a9a7297b9ca42 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 5 Nov 2018 19:58:18 -0700 Subject: [PATCH 1/2] 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; - } } From acd412d09eebb8012f865293e7c7be874fd7bcae Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 5 Nov 2018 20:20:32 -0700 Subject: [PATCH 2/2] runelite-client: Use Runescape themed closer for sidebar when overlaying --- .../java/net/runelite/client/ui/ClientUI.java | 31 ++++++++---------- .../net/runelite/client/ui/open_rs.png | Bin 0 -> 3006 bytes 2 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/ui/open_rs.png 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 912e7e6941..264b88ce61 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 @@ -104,16 +104,7 @@ public class ClientUI private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized"; private static final int CLIENT_WELL_HIDDEN_MARGIN = 160; private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10; - public static final BufferedImage ICON; - private static final BufferedImage SIDEBAR_OPEN; - private static final BufferedImage SIDEBAR_CLOSE; - - static - { - ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png"); - SIDEBAR_OPEN = ImageUtil.getResourceStreamFromClass(ClientUI.class, "open.png"); - SIDEBAR_CLOSE = ImageUtil.flipImage(SIDEBAR_OPEN, true, false); - } + public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png"); @Getter private TrayIcon trayIcon; @@ -128,6 +119,8 @@ public class ClientUI private final CardLayout cardLayout = new CardLayout(); private final Rectangle sidebarButtonPosition = new Rectangle(); private boolean withTitleBar; + private BufferedImage sidebarOpenIcon; + private BufferedImage sidebarClosedIcon; private ContainableFrame frame; private JPanel navContainer; private PluginPanel pluginPanel; @@ -436,10 +429,14 @@ public class ClientUI updateFrameConfig(true); // Create hide sidebar button + + sidebarOpenIcon = ImageUtil.getResourceStreamFromClass(ClientUI.class, withTitleBar ? "open.png" : "open_rs.png"); + sidebarClosedIcon = ImageUtil.flipImage(sidebarOpenIcon, true, false); + sidebarNavigationButton = NavigationButton .builder() .priority(100) - .icon(SIDEBAR_CLOSE) + .icon(sidebarClosedIcon) .onClick(this::toggleSidebar) .build(); @@ -623,16 +620,16 @@ public class ClientUI return; } - final Client client = (Client)this.client; - final int x = client.getRealDimensions().width - SIDEBAR_OPEN.getWidth() - 5; + final Client client = (Client) this.client; + final int x = client.getRealDimensions().width - sidebarOpenIcon.getWidth() - 5; // Offset sidebar button if resizable mode logout is visible final Widget logoutButton = client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_LOGOUT_BUTTON); final int y = logoutButton != null && !logoutButton.isHidden() && logoutButton.getParent() != null - ? logoutButton.getHeight() + logoutButton.getRelativeY() + 5 + ? logoutButton.getHeight() + logoutButton.getRelativeY() : 5; - final BufferedImage image = sidebarOpen ? SIDEBAR_OPEN : SIDEBAR_CLOSE; + final BufferedImage image = sidebarOpen ? sidebarOpenIcon : sidebarClosedIcon; graphics.drawImage(image, x, y, null); // Update button dimensions @@ -663,7 +660,7 @@ public class ClientUI if (isSidebarOpen) { - sidebarNavigationJButton.setIcon(new ImageIcon(SIDEBAR_OPEN)); + sidebarNavigationJButton.setIcon(new ImageIcon(sidebarOpenIcon)); sidebarNavigationJButton.setToolTipText("Open SideBar"); contract(); @@ -673,7 +670,7 @@ public class ClientUI } else { - sidebarNavigationJButton.setIcon(new ImageIcon(SIDEBAR_CLOSE)); + sidebarNavigationJButton.setIcon(new ImageIcon(sidebarClosedIcon)); sidebarNavigationJButton.setToolTipText("Close SideBar"); // Try to restore last panel diff --git a/runelite-client/src/main/resources/net/runelite/client/ui/open_rs.png b/runelite-client/src/main/resources/net/runelite/client/ui/open_rs.png new file mode 100644 index 0000000000000000000000000000000000000000..e0cb3df043dbacf1e9273deb28c7005708b1da9a GIT binary patch literal 3006 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 AkN^Mx literal 0 HcmV?d00001