ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

runelite-client: Use Runescape themed closer for sidebar when overlaying

Browse Source
This commit is contained in:
Max Weber
2018-11-05 20:20:32 -07:00
parent f149b554c7
commit acd412d09e
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -104,16 +104,7 @@ public class ClientUI
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized"; 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 = 160;
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10; private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
public static final BufferedImage ICON; public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png");
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);
}
@Getter @Getter
private TrayIcon trayIcon; private TrayIcon trayIcon;
@@ -128,6 +119,8 @@ public class ClientUI
private final CardLayout cardLayout = new CardLayout(); private final CardLayout cardLayout = new CardLayout();
private final Rectangle sidebarButtonPosition = new Rectangle(); private final Rectangle sidebarButtonPosition = new Rectangle();
private boolean withTitleBar; private boolean withTitleBar;
private BufferedImage sidebarOpenIcon;
private BufferedImage sidebarClosedIcon;
private ContainableFrame frame; private ContainableFrame frame;
private JPanel navContainer; private JPanel navContainer;
private PluginPanel pluginPanel; private PluginPanel pluginPanel;
@@ -436,10 +429,14 @@ public class ClientUI
updateFrameConfig(true); updateFrameConfig(true);
// Create hide sidebar button // Create hide sidebar button
sidebarOpenIcon = ImageUtil.getResourceStreamFromClass(ClientUI.class, withTitleBar ? "open.png" : "open_rs.png");
sidebarClosedIcon = ImageUtil.flipImage(sidebarOpenIcon, true, false);
sidebarNavigationButton = NavigationButton sidebarNavigationButton = NavigationButton
.builder() .builder()
.priority(100) .priority(100)
.icon(SIDEBAR_CLOSE) .icon(sidebarClosedIcon)
.onClick(this::toggleSidebar) .onClick(this::toggleSidebar)
.build(); .build();
@@ -623,16 +620,16 @@ public class ClientUI
return; return;
} }
final Client client = (Client)this.client; final Client client = (Client) this.client;
final int x = client.getRealDimensions().width - SIDEBAR_OPEN.getWidth() - 5; final int x = client.getRealDimensions().width - sidebarOpenIcon.getWidth() - 5;
// Offset sidebar button if resizable mode logout is visible // Offset sidebar button if resizable mode logout is visible
final Widget logoutButton = client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_LOGOUT_BUTTON); final Widget logoutButton = client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_LOGOUT_BUTTON);
final int y = logoutButton != null && !logoutButton.isHidden() && logoutButton.getParent() != null final int y = logoutButton != null && !logoutButton.isHidden() && logoutButton.getParent() != null
? logoutButton.getHeight() + logoutButton.getRelativeY() + 5 ? logoutButton.getHeight() + logoutButton.getRelativeY()
: 5; : 5;
final BufferedImage image = sidebarOpen ? SIDEBAR_OPEN : SIDEBAR_CLOSE; final BufferedImage image = sidebarOpen ? sidebarOpenIcon : sidebarClosedIcon;
graphics.drawImage(image, x, y, null); graphics.drawImage(image, x, y, null);
// Update button dimensions // Update button dimensions
@@ -663,7 +660,7 @@ public class ClientUI
if (isSidebarOpen) if (isSidebarOpen)
{ {
sidebarNavigationJButton.setIcon(new ImageIcon(SIDEBAR_OPEN)); sidebarNavigationJButton.setIcon(new ImageIcon(sidebarOpenIcon));
sidebarNavigationJButton.setToolTipText("Open SideBar"); sidebarNavigationJButton.setToolTipText("Open SideBar");
contract(); contract();
@@ -673,7 +670,7 @@ public class ClientUI
} }
else else
{ {
sidebarNavigationJButton.setIcon(new ImageIcon(SIDEBAR_CLOSE)); sidebarNavigationJButton.setIcon(new ImageIcon(sidebarClosedIcon));
sidebarNavigationJButton.setToolTipText("Close SideBar"); sidebarNavigationJButton.setToolTipText("Close SideBar");
// Try to restore last panel // Try to restore last panel

BIN
runelite-client/src/main/resources/net/runelite/client/ui/open_rs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB