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

Merge pull request #1248 from sethtroll/addinfoboxsettings

Browse Source 
infobox overlay: Configure the amount of info boxes per row
This commit is contained in:
Adam
2018-04-23 15:42:23 -04:00
committed by GitHub
parent 4118fa9f50 9a27d37eae
commit 0edfbb59b6
3 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,4 +133,26 @@ public interface RuneLiteConfig extends Config
{
return FontType.SMALL;
}
@ConfigItem(
keyName = "infoBoxVertical",
name = "Display infoboxes vertically",
description = "Toggles the infoboxes to display vertically",
position = 10
)
default boolean infoBoxVertical()
{
return false;
}
@ConfigItem(
keyName = "infoBoxWrap",
name = "Infobox wrap count",
description = "Configures the amount of infoboxes shown before wrapping",
position = 11
)
default int infoBoxWrap()
{
return 4;
}
}

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/InfoBoxComponent.java
View File

@@ -71,7 +71,7 @@ public class InfoBoxComponent implements RenderableEntity
{
graphics.drawImage(image,
position.x + (BOX_SIZE - image.getWidth()) / 2,
(BOX_SIZE - image.getHeight()) / 2, null);
position.y + (BOX_SIZE - image.getHeight()) / 2, null);
}
final TextComponent textComponent = new TextComponent();
@@ -79,7 +79,7 @@ public class InfoBoxComponent implements RenderableEntity
textComponent.setText(text);
textComponent.setPosition(new Point(
position.x + ((BOX_SIZE - metrics.stringWidth(text)) / 2),
BOX_SIZE - SEPARATOR));
position.y + BOX_SIZE - SEPARATOR));
textComponent.render(graphics);
return new Dimension(BOX_SIZE, BOX_SIZE);
}

68
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java
View File

@@ -34,6 +34,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Provider;
import net.runelite.api.Client;
import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
@@ -45,18 +46,21 @@ public class InfoBoxOverlay extends Overlay
{
private static final int BOXSIZE = 35;
private static final int SEPARATOR = 2;
private static final int TOTAL_BOXSIZE = BOXSIZE + SEPARATOR;
private final InfoBoxManager infoboxManager;
private final TooltipManager tooltipManager;
private final Provider<Client> clientProvider;
private final RuneLiteConfig config;
@Inject
public InfoBoxOverlay(InfoBoxManager infoboxManager, TooltipManager tooltipManager, Provider<Client> clientProvider)
public InfoBoxOverlay(InfoBoxManager infoboxManager, TooltipManager tooltipManager, Provider<Client> clientProvider, RuneLiteConfig config)
{
setPosition(OverlayPosition.TOP_LEFT);
this.tooltipManager = tooltipManager;
this.infoboxManager = infoboxManager;
this.clientProvider = clientProvider;
this.config = config;
}
@Override
@@ -69,8 +73,24 @@ public class InfoBoxOverlay extends Overlay
return null;
}
int width = infoBoxes.size() * (BOXSIZE + SEPARATOR);
int wrap = config.infoBoxWrap();
int infoBoxCount = infoBoxes.size();
boolean vertical = config.infoBoxVertical();
int width, height;
if (!vertical)
{
width = getWidth(infoBoxCount, wrap);
height = getHeight(infoBoxCount, wrap);
}
else
{
width = getHeight(infoBoxCount, wrap);
height = getWidth(infoBoxCount, wrap);
}
int x = 0;
int y = 0;
for (InfoBox box : infoBoxes)
{
@@ -84,14 +104,14 @@ public class InfoBoxOverlay extends Overlay
infoBoxComponent.setColor(box.getTextColor());
infoBoxComponent.setImage(box.getImage());
infoBoxComponent.setText(box.getText());
infoBoxComponent.setPosition(new Point(x, 0));
infoBoxComponent.setPosition(new Point(x, y));
final Dimension infoBoxBounds = infoBoxComponent.render(graphics);
if (!Strings.isNullOrEmpty(box.getTooltip()))
{
final Rectangle intersectionRectangle = new Rectangle(infoBoxBounds);
intersectionRectangle.setLocation(getBounds().getLocation());
intersectionRectangle.translate(x, 0);
intersectionRectangle.translate(x, y);
final Point transformed = OverlayUtil.transformPosition(getPosition(), intersectionRectangle.getSize());
intersectionRectangle.translate(transformed.x, transformed.y);
@@ -104,9 +124,45 @@ public class InfoBoxOverlay extends Overlay
}
}
x += BOXSIZE + SEPARATOR;
// Determine which axis to reset/increase
if (vertical)
{
// Reset y if newbox reaches height limit
if (y + TOTAL_BOXSIZE < height)
{
y += TOTAL_BOXSIZE;
}
else
{
y = 0;
x += TOTAL_BOXSIZE;
}
}
else
{
// Reset x if newbox reaches width limit
if (x + TOTAL_BOXSIZE < width)
{
x += TOTAL_BOXSIZE;
}
else
{
x = 0;
y += TOTAL_BOXSIZE;
}
}
}
return new Dimension(width, BOXSIZE);
return new Dimension(width, height);
}
private static int getHeight(int infoBoxCount, int maxRow)
{
return maxRow == 0 ? TOTAL_BOXSIZE : (int) Math.ceil((double)infoBoxCount / maxRow) * TOTAL_BOXSIZE;
}
private static int getWidth(int infoBoxCount, int maxRow)
{
return maxRow == 0 ? infoBoxCount * TOTAL_BOXSIZE : (maxRow > infoBoxCount ? infoBoxCount : maxRow) * TOTAL_BOXSIZE;
}
}