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

Set correct offsets to overlays, smaller panels

Browse Source 
- Set correct offsets for overlays based on resizable or fixed mode
- Change PanelComponent inside padding to be slighly smaller

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-03-08 00:39:16 +01:00
parent 9aac22477b
commit 3bbc18299e
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -58,8 +58,11 @@ import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
@Slf4j @Slf4j
public class OverlayRenderer public class OverlayRenderer
{ {
private static final int BORDER_TOP = 25; private static final int BORDER_LEFT_RESIZABLE = 5;
private static final int BORDER_LEFT = 5; private static final int BORDER_TOP_RESIZABLE = 20;
private static final int FRAME_OFFSET = 4;
private static final int BORDER_LEFT_FIXED = BORDER_LEFT_RESIZABLE + FRAME_OFFSET;
private static final int BORDER_TOP_FIXED = BORDER_TOP_RESIZABLE + FRAME_OFFSET;
private static final int BORDER_RIGHT = 2; private static final int BORDER_RIGHT = 2;
private static final int BORDER_BOTTOM = 2; private static final int BORDER_BOTTOM = 2;
private static final int PADDING = 2; private static final int PADDING = 2;
@@ -192,6 +195,7 @@ public class OverlayRenderer
return; return;
} }
final boolean isResizeable = client.isResized();
final Widget viewport = client.getViewportWidget(); final Widget viewport = client.getViewportWidget();
final Rectangle bounds = viewport != null final Rectangle bounds = viewport != null
? new Rectangle(viewport.getBounds()) ? new Rectangle(viewport.getBounds())
@@ -203,18 +207,20 @@ public class OverlayRenderer
OverlayUtil.setGraphicProperties(graphics); OverlayUtil.setGraphicProperties(graphics);
final Point topLeftPoint = new Point(); final Point topLeftPoint = new Point();
topLeftPoint.move(BORDER_LEFT, BORDER_TOP); topLeftPoint.move(
isResizeable ? BORDER_LEFT_RESIZABLE : BORDER_LEFT_FIXED,
isResizeable ? BORDER_TOP_RESIZABLE : BORDER_TOP_FIXED);
final Point topRightPoint = new Point(); final Point topRightPoint = new Point();
topRightPoint.move(bounds.x + bounds.width - BORDER_RIGHT, BORDER_TOP); topRightPoint.move(bounds.x + bounds.width - BORDER_RIGHT, BORDER_TOP_FIXED);
final Point bottomLeftPoint = new Point(); final Point bottomLeftPoint = new Point();
bottomLeftPoint.move(BORDER_LEFT, bounds.y + bounds.height - BORDER_BOTTOM); bottomLeftPoint.move(isResizeable ? BORDER_LEFT_RESIZABLE : BORDER_LEFT_FIXED, bounds.y + bounds.height - BORDER_BOTTOM);
final Point bottomRightPoint = new Point(); final Point bottomRightPoint = new Point();
bottomRightPoint.move(bounds.x + bounds.width - BORDER_RIGHT, bounds.y + bounds.height - BORDER_BOTTOM); bottomRightPoint.move(bounds.x + bounds.width - BORDER_RIGHT, bounds.y + bounds.height - BORDER_BOTTOM);
final Point rightChatboxPoint = new Point(); final Point rightChatboxPoint = new Point();
rightChatboxPoint.move(bounds.x + chatboxBounds.width - BORDER_RIGHT, bounds.y + bounds.height - BORDER_BOTTOM); rightChatboxPoint.move(bounds.x + chatboxBounds.width - BORDER_RIGHT, bounds.y + bounds.height - BORDER_BOTTOM);
//check to see if Chatbox is minimized //check to see if Chatbox is minimized
if (chatbox != null && client.isResized() && chatbox.isHidden()) if (chatbox != null && isResizeable && chatbox.isHidden())
{ {
rightChatboxPoint.y += chatboxBounds.height; rightChatboxPoint.y += chatboxBounds.height;
bottomLeftPoint.y += chatboxBounds.height; bottomLeftPoint.y += chatboxBounds.height;

8
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImagePanelComponent.java
View File

@@ -41,10 +41,10 @@ import net.runelite.client.ui.overlay.RenderableEntity;
public class ImagePanelComponent implements RenderableEntity public class ImagePanelComponent implements RenderableEntity
{ {
private static final int TOP_BORDER = 3; private static final int TOP_BORDER = 4;
private static final int SIDE_BORDER = 6; private static final int SIDE_BORDER = 4;
private static final int BOTTOM_BORDER = 6; private static final int BOTTOM_BORDER = 4;
private static final int SEPARATOR = 4; private static final int SEPARATOR = 1;
@Setter @Setter
@Nullable @Nullable

10
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java
View File

@@ -43,11 +43,11 @@ import net.runelite.client.ui.overlay.RenderableEntity;
public class PanelComponent implements RenderableEntity public class PanelComponent implements RenderableEntity
{ {
private static final int TOP_BORDER = 3; private static final int TOP_BORDER = 4;
private static final int LEFT_BORDER = 6; private static final int LEFT_BORDER = 4;
private static final int RIGHT_BORDER = 6; private static final int RIGHT_BORDER = 4;
private static final int BOTTOM_BORDER = 6; private static final int BOTTOM_BORDER = 4;
private static final int SEPARATOR = 2; private static final int SEPARATOR = 1;
@Data @Data
@AllArgsConstructor @AllArgsConstructor