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

Merge pull request #3041 from Sundar-Gandu/master

Browse Source
This commit is contained in:
Owain van Brakel
2021-09-24 01:23:59 +02:00
committed by GitHub
parent 3243a8679e 65dc16fb3a
commit f51d7aee6c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@ public class ClientUI
private final Provider<ClientThread> clientThreadProvider; private final Provider<ClientThread> clientThreadProvider;
private final EventBus eventBus; private final EventBus eventBus;
private final boolean safeMode; private final boolean safeMode;
private final String title;
private final CardLayout cardLayout = new CardLayout(); private final CardLayout cardLayout = new CardLayout();
private final Rectangle sidebarButtonPosition = new Rectangle(); private final Rectangle sidebarButtonPosition = new Rectangle();
@@ -166,6 +167,7 @@ public class ClientUI
this.clientThreadProvider = clientThreadProvider; this.clientThreadProvider = clientThreadProvider;
this.eventBus = eventBus; this.eventBus = eventBus;
this.safeMode = safeMode; this.safeMode = safeMode;
this.title = RuneLiteProperties.getTitle();
} }
@Subscribe @Subscribe
@@ -299,7 +301,7 @@ public class ClientUI
return false; return false;
} }
frame.setTitle(RuneLiteProperties.getTitle() + " - " + name); frame.setTitle(title + " - " + name);
return true; return true;
}); });
} }
@@ -326,7 +328,7 @@ public class ClientUI
// Try to enable fullscreen on OSX // Try to enable fullscreen on OSX
OSXUtil.tryEnableFullscreen(frame); OSXUtil.tryEnableFullscreen(frame);
frame.setTitle(RuneLiteProperties.getTitle()); frame.setTitle(title);
frame.setIconImage(ICON); frame.setIconImage(ICON);
frame.getLayeredPane().setCursor(Cursor.getDefaultCursor()); // Prevent substance from using a resize cursor for pointing frame.getLayeredPane().setCursor(Cursor.getDefaultCursor()); // Prevent substance from using a resize cursor for pointing
frame.setLocationRelativeTo(frame.getOwner()); frame.setLocationRelativeTo(frame.getOwner());
@@ -512,7 +514,7 @@ public class ClientUI
frame.revalidateMinimumSize(); frame.revalidateMinimumSize();
// Create tray icon (needs to be created after frame is packed) // Create tray icon (needs to be created after frame is packed)
trayIcon = SwingUtil.createTrayIcon(ICON, RuneLiteProperties.getTitle(), frame); trayIcon = SwingUtil.createTrayIcon(ICON, title, frame);
// Move frame around (needs to be done after frame is packed) // Move frame around (needs to be done after frame is packed)
if (config.rememberScreenBounds() && !safeMode) if (config.rememberScreenBounds() && !safeMode)
@@ -1039,12 +1041,12 @@ public class ClientUI
if (player != null && player.getName() != null) if (player != null && player.getName() != null)
{ {
frame.setTitle(RuneLiteProperties.getTitle() + " - " + player.getName()); frame.setTitle(title + " - " + player.getName());
} }
} }
else else
{ {
frame.setTitle(RuneLiteProperties.getTitle()); frame.setTitle(title);
} }
if (frame.isAlwaysOnTopSupported()) if (frame.isAlwaysOnTopSupported())