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

Correctly focus game canvas when requesting focus

Browse Source 
Correctly focus game canvas when requesting ClientUI focus. Also, move
the call to OSXUtil.requestFocus() to clientUI.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-03-03 03:58:01 +01:00
parent 40ec85ac7e
commit b9cde8a787
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
import net.runelite.client.util.OSType; import net.runelite.client.util.OSType;
import net.runelite.client.util.OSXUtil;
@Singleton @Singleton
@Slf4j @Slf4j
@@ -99,14 +98,7 @@ public class Notifier
if (runeLiteConfig.requestFocusOnNotification()) if (runeLiteConfig.requestFocusOnNotification())
{ {
if (OSType.getOSType() == OSType.MacOS) clientUI.requestFocus();
{
OSXUtil.requestFocus();
}
else
{
clientUI.requestFocus();
}
} }
if (runeLiteConfig.enableTrayNotifications()) if (runeLiteConfig.enableTrayNotifications())

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

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.ui; package net.runelite.client.ui;
import com.google.common.eventbus.Subscribe;
import java.applet.Applet; import java.applet.Applet;
import java.awt.AWTException; import java.awt.AWTException;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@@ -57,7 +58,6 @@ import javax.swing.ToolTipManager;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException; import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.plaf.FontUIResource; import javax.swing.plaf.FontUIResource;
import com.google.common.eventbus.Subscribe;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -65,6 +65,7 @@ import net.runelite.api.GameState;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.client.RuneLite; import net.runelite.client.RuneLite;
import net.runelite.client.RuneLiteProperties; import net.runelite.client.RuneLiteProperties;
import net.runelite.client.util.OSType;
import net.runelite.client.util.OSXUtil; import net.runelite.client.util.OSXUtil;
import org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel; import org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel;
import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities; import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
@@ -371,6 +372,18 @@ public class ClientUI extends JFrame
add(container); add(container);
} }
@Override
public void requestFocus()
{
if (OSType.getOSType() == OSType.MacOS)
{
OSXUtil.requestFocus();
}
super.requestFocus();
giveClientFocus();
}
private void revalidateMinimumSize() private void revalidateMinimumSize()
{ {
// The JFrame only respects minimumSize if it was set by setMinimumSize, for some reason. (atleast on windows/native) // The JFrame only respects minimumSize if it was set by setMinimumSize, for some reason. (atleast on windows/native)