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

Merge pull request #1357 from deathbeam/flag-only-for-dynamic

Browse Source 
Apply small font option only to dynamic overlays
This commit is contained in:
Adam
2018-04-14 18:54:44 -04:00
committed by GitHub
parent eec42b5931 0d078622e0
commit 3ab7dbae1e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,11 +119,11 @@ public interface RuneLiteConfig extends Config
@ConfigItem( @ConfigItem(
keyName = "useSmallFont", keyName = "useSmallFont",
name = "Use smaller font for in-game overlays", name = "Small font in dynamic overlays",
description = "Toggles between small and regular RuneScape font for in-game overlays" description = "Toggles between small and regular RuneScape font for in-game overlays"
) )
default boolean useSmallFont() default boolean useSmallFont()
{ {
return false; return true;
} }
} }

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

@@ -281,12 +281,6 @@ public class OverlayRenderer extends MouseListener implements KeyListener
// Create copy of snap corners because overlays will modify them // Create copy of snap corners because overlays will modify them
OverlayBounds snapCorners = new OverlayBounds(this.snapCorners); OverlayBounds snapCorners = new OverlayBounds(this.snapCorners);
// Set font based on configuration
graphics.setFont(runeLiteConfig.useSmallFont()
? FontManager.getRunescapeSmallFont()
: FontManager.getRunescapeFont());
OverlayUtil.setGraphicProperties(graphics); OverlayUtil.setGraphicProperties(graphics);
// Draw snap corners // Draw snap corners
@@ -500,6 +494,7 @@ public class OverlayRenderer extends MouseListener implements KeyListener
private void safeRender(Client client, Overlay overlay, OverlayLayer layer, Graphics2D graphics, Point point) private void safeRender(Client client, Overlay overlay, OverlayLayer layer, Graphics2D graphics, Point point)
{ {
final Graphics2D subGraphics = (Graphics2D) graphics.create(); final Graphics2D subGraphics = (Graphics2D) graphics.create();
if (!isResizeable && (layer == OverlayLayer.ABOVE_SCENE || layer == OverlayLayer.UNDER_WIDGETS)) if (!isResizeable && (layer == OverlayLayer.ABOVE_SCENE || layer == OverlayLayer.UNDER_WIDGETS))
{ {
subGraphics.setClip(client.getViewportXOffset(), subGraphics.setClip(client.getViewportXOffset(),
@@ -507,6 +502,16 @@ public class OverlayRenderer extends MouseListener implements KeyListener
client.getViewportWidth(), client.getViewportWidth(),
client.getViewportHeight()); client.getViewportHeight());
} }
final OverlayPosition position = overlay.getPosition();
// Set font based on configuration
subGraphics.setFont((position == OverlayPosition.DYNAMIC
|| position == OverlayPosition.TOOLTIP)
&& runeLiteConfig.useSmallFont()
? FontManager.getRunescapeSmallFont()
: FontManager.getRunescapeFont());
subGraphics.translate(point.x, point.y); subGraphics.translate(point.x, point.y);
final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension()); final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension());
subGraphics.dispose(); subGraphics.dispose();