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

runelite-client: Don't check if customChrome is enabled after startup

Browse Source 
This value is locked in at startup, the config value is irrelevant to what should actually be happening
This commit is contained in:
Max Weber
2018-11-05 19:58:18 -07:00
parent cd15227585
commit f149b554c7
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@ public class ClientUI
private final Provider<ClientThread> clientThreadProvider; private final Provider<ClientThread> clientThreadProvider;
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 ContainableFrame frame; private ContainableFrame frame;
private JPanel navContainer; private JPanel navContainer;
private PluginPanel pluginPanel; private PluginPanel pluginPanel;
@@ -179,8 +180,7 @@ public class ClientUI
{ {
final NavigationButton navigationButton = event.getButton(); final NavigationButton navigationButton = event.getButton();
final PluginPanel pluginPanel = navigationButton.getPanel(); final PluginPanel pluginPanel = navigationButton.getPanel();
final boolean inTitle = !event.getButton().isTab() && final boolean inTitle = !event.getButton().isTab() && withTitleBar;
(config.enableCustomChrome() || SwingUtil.isCustomTitlePanePresent(frame));
final int iconSize = 16; final int iconSize = 16;
if (pluginPanel != null) if (pluginPanel != null)
@@ -382,7 +382,7 @@ public class ClientUI
mouseManager.registerMouseListener(mouseListener); mouseManager.registerMouseListener(mouseListener);
// Decorate window with custom chrome and titlebar if needed // Decorate window with custom chrome and titlebar if needed
final boolean withTitleBar = config.enableCustomChrome(); withTitleBar = config.enableCustomChrome();
frame.setUndecorated(withTitleBar); frame.setUndecorated(withTitleBar);
if (withTitleBar) if (withTitleBar)
@@ -618,7 +618,7 @@ public class ClientUI
*/ */
public void paintOverlays(final Graphics2D graphics) public void paintOverlays(final Graphics2D graphics)
{ {
if (!(client instanceof Client) || config.enableCustomChrome()) if (!(client instanceof Client) || withTitleBar)
{ {
return; return;
} }
@@ -807,7 +807,7 @@ public class ClientUI
} }
frame.setExpandResizeType(config.automaticResizeType()); frame.setExpandResizeType(config.automaticResizeType());
frame.setContainedInScreen(config.containInScreen() && config.enableCustomChrome()); frame.setContainedInScreen(config.containInScreen() && withTitleBar);
if (!config.rememberScreenBounds()) if (!config.rememberScreenBounds())
{ {

13
runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
View File

@@ -31,7 +31,6 @@ import java.awt.Frame;
import java.awt.Image; import java.awt.Image;
import java.awt.SystemTray; import java.awt.SystemTray;
import java.awt.TrayIcon; import java.awt.TrayIcon;
import java.awt.Window;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter; 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.NavigationButton;
import net.runelite.client.ui.components.CustomScrollBarUI; import net.runelite.client.ui.components.CustomScrollBarUI;
import org.pushingpixels.substance.internal.SubstanceSynapse; import org.pushingpixels.substance.internal.SubstanceSynapse;
import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
/** /**
* Various Swing utilities. * Various Swing utilities.
@@ -279,15 +277,4 @@ public class SwingUtil
navigationButton.setOnSelect(button::doClick); navigationButton.setOnSelect(button::doClick);
return button; 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;
}
} }