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

Merge pull request #9345 from abextm/combobox-containable

Browse Source 
runelite-client: Allow partial screen containment again
This commit is contained in:
Tomas Slusny
2019-07-15 14:21:39 +02:00
committed by GitHub
parent d289171a3a bd89209a99
commit 762e9bae0a
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.config;
import java.awt.Dimension; import java.awt.Dimension;
import net.runelite.api.Constants; import net.runelite.api.Constants;
import net.runelite.client.ui.ContainableFrame;
@ConfigGroup("runelite") @ConfigGroup("runelite")
public interface RuneLiteConfig extends Config public interface RuneLiteConfig extends Config
@@ -64,14 +65,14 @@ public interface RuneLiteConfig extends Config
} }
@ConfigItem( @ConfigItem(
keyName = "containInScreen", keyName = "containInScreen2",
name = "Contain in screen", name = "Contain in screen",
description = "Makes the client stay contained in the screen when attempted to move out of it.<br>Note: Only works if custom chrome is enabled.", description = "Makes the client stay contained in the screen when attempted to move out of it.<br>Note: 'Always' only works if custom chrome is enabled.",
position = 13 position = 13
) )
default boolean containInScreen() default ContainableFrame.Mode containInScreen()
{ {
return false; return ContainableFrame.Mode.RESIZING;
} }
@ConfigItem( @ConfigItem(

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

@@ -858,7 +858,15 @@ public class ClientUI
} }
frame.setExpandResizeType(config.automaticResizeType()); frame.setExpandResizeType(config.automaticResizeType());
frame.setContainedInScreen(config.containInScreen() && withTitleBar);
ContainableFrame.Mode containMode = config.containInScreen();
if (containMode == ContainableFrame.Mode.ALWAYS && !withTitleBar)
{
// When native window decorations are enabled we don't have a way to receive window move events
// so we can't contain to screen always.
containMode = ContainableFrame.Mode.RESIZING;
}
frame.setContainedInScreen(containMode);
if (!config.rememberScreenBounds()) if (!config.rememberScreenBounds())
{ {

41
runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java
View File

@@ -32,18 +32,25 @@ import net.runelite.client.config.ExpandResizeType;
public class ContainableFrame extends JFrame public class ContainableFrame extends JFrame
{ {
public enum Mode
{
ALWAYS,
RESIZING,
NEVER;
}
private static final int SCREEN_EDGE_CLOSE_DISTANCE = 40; private static final int SCREEN_EDGE_CLOSE_DISTANCE = 40;
@Setter @Setter
private ExpandResizeType expandResizeType; private ExpandResizeType expandResizeType;
private boolean containedInScreen; private Mode containedInScreen;
private boolean expandedClientOppositeDirection; private boolean expandedClientOppositeDirection;
public void setContainedInScreen(boolean value) public void setContainedInScreen(Mode value)
{ {
this.containedInScreen = value; this.containedInScreen = value;
if (value) if (this.containedInScreen == Mode.ALWAYS)
{ {
// Reposition the frame if it is intersecting with the bounds // Reposition the frame if it is intersecting with the bounds
this.setLocation(this.getX(), this.getY()); this.setLocation(this.getX(), this.getY());
@@ -54,13 +61,13 @@ public class ContainableFrame extends JFrame
@Override @Override
public void setLocation(int x, int y) public void setLocation(int x, int y)
{ {
if (containedInScreen) if (this.containedInScreen == Mode.ALWAYS)
{ {
Rectangle bounds = this.getGraphicsConfiguration().getBounds(); Rectangle bounds = this.getGraphicsConfiguration().getBounds();
x = Math.max(x, (int)bounds.getX()); x = Math.max(x, (int) bounds.getX());
x = Math.min(x, (int)(bounds.getX() + bounds.getWidth() - this.getWidth())); x = Math.min(x, (int) (bounds.getX() + bounds.getWidth() - this.getWidth()));
y = Math.max(y, (int)bounds.getY()); y = Math.max(y, (int) bounds.getY());
y = Math.min(y, (int)(bounds.getY() + bounds.getHeight() - this.getHeight())); y = Math.min(y, (int) (bounds.getY() + bounds.getHeight() - this.getHeight()));
} }
super.setLocation(x, y); super.setLocation(x, y);
@@ -69,15 +76,17 @@ public class ContainableFrame extends JFrame
@Override @Override
public void setBounds(int x, int y, int width, int height) public void setBounds(int x, int y, int width, int height)
{ {
if (containedInScreen) if (this.containedInScreen == Mode.ALWAYS)
{ {
// XXX: this is wrong if setSize/resize is called because Component::resize sets private state that is read
// in Window::setBounds
Rectangle bounds = this.getGraphicsConfiguration().getBounds(); Rectangle bounds = this.getGraphicsConfiguration().getBounds();
width = Math.min(width, width - (int)bounds.getX() + x); width = Math.min(width, width - (int) bounds.getX() + x);
x = Math.max(x, (int)bounds.getX()); x = Math.max(x, (int) bounds.getX());
height = Math.min(height, height - (int)bounds.getY() + y); height = Math.min(height, height - (int) bounds.getY() + y);
y = Math.max(y, (int)bounds.getY()); y = Math.max(y, (int) bounds.getY());
width = Math.min(width, (int)(bounds.getX() + bounds.getWidth()) - x); width = Math.min(width, (int) (bounds.getX() + bounds.getWidth()) - x);
height = Math.min(height, (int)(bounds.getY() + bounds.getHeight()) - y); height = Math.min(height, (int) (bounds.getY() + bounds.getHeight()) - y);
} }
super.setBounds(x, y, width, height); super.setBounds(x, y, width, height);
@@ -115,7 +124,7 @@ public class ContainableFrame extends JFrame
final int newWindowWidth = getWidth() + increment; final int newWindowWidth = getWidth() + increment;
int newWindowX = getX(); int newWindowX = getX();
if (containedInScreen) if (this.containedInScreen != Mode.NEVER)
{ {
final Rectangle screenBounds = getGraphicsConfiguration().getBounds(); final Rectangle screenBounds = getGraphicsConfiguration().getBounds();
final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth(); final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth();