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

runelite-client: Don't try to contain to screen when contain is off

Browse Source 
Java's GraphicsConfiguration::getBounds() is completely nonfunctional
for me, returning nearly random values, which causes the our window to
move itself to random places, often outside of my displays' bounds
This commit is contained in:
Max Weber
2019-07-03 00:48:18 -06:00
parent 23197077a6
commit d72a1b9456
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,23 +113,27 @@ public class ContainableFrame extends JFrame
if (forcedWidthIncrease || expandResizeType == ExpandResizeType.KEEP_GAME_SIZE) if (forcedWidthIncrease || expandResizeType == ExpandResizeType.KEEP_GAME_SIZE)
{ {
final int newWindowWidth = getWidth() + increment; final int newWindowWidth = getWidth() + increment;
final Rectangle screenBounds = getGraphicsConfiguration().getBounds();
final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth();
int newWindowX = getX(); int newWindowX = getX();
if (wouldExpandThroughEdge) if (containedInScreen)
{ {
if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge()) final Rectangle screenBounds = getGraphicsConfiguration().getBounds();
final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth();
if (wouldExpandThroughEdge)
{ {
// Move the window to the edge if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge())
newWindowX = (int)(screenBounds.getX() + screenBounds.getWidth()) - getWidth(); {
// Move the window to the edge
newWindowX = (int) (screenBounds.getX() + screenBounds.getWidth()) - getWidth();
}
// Expand the window to the left as the user probably don't want the
// window to go through the screen
newWindowX -= increment;
expandedClientOppositeDirection = true;
} }
// Expand the window to the left as the user probably don't want the
// window to go through the screen
newWindowX -= increment;
expandedClientOppositeDirection = true;
} }
setBounds(newWindowX, getY(), newWindowWidth, getHeight()); setBounds(newWindowX, getY(), newWindowWidth, getHeight());