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

Make XP globes use TOP_CENTER snap point

Browse Source 
Make XP globes layoutable and make them use TOP_CENTER snap point for
layouting. This removes the need for configurable centering, so remove
that as well.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-09-05 12:23:42 +02:00
parent 503e4bc3b8
commit e05c1baffd
3 changed files with 8 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/OrbCentering.java
View File

@@ -1,32 +0,0 @@
/*
* Copyright (c) 2018, l2-
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.xpglobes;
public enum OrbCentering
{
MIDDLE_CANVAS,
MIDDLE_VIEWPORT,
DYNAMIC
}

13
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java
View File

@@ -98,22 +98,11 @@ public interface XpGlobesConfig extends Config
return 40;
}
@ConfigItem(
keyName = "Center orbs",
name = "Center orbs",
description = "Where to center the xp orbs around",
position = 6
)
default OrbCentering centerOrbs()
{
return OrbCentering.DYNAMIC;
}
@ConfigItem(
keyName = "Orb duration",
name = "Duration of orbs",
description = "Change the duration the xp orbs are visible",
position = 7
position = 6
)
default int xpOrbDuration()
{

68
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -40,12 +40,10 @@ import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.Experience;
import net.runelite.api.Point;
import net.runelite.api.widgets.Widget;
import net.runelite.client.game.SkillIconManager;
import net.runelite.client.plugins.xptracker.XpTrackerService;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.ProgressBarComponent;
@@ -78,68 +76,14 @@ public class XpGlobesOverlay extends Overlay
this.plugin = plugin;
this.config = config;
this.xpTrackerService = xpTrackerService;
setPosition(OverlayPosition.DETACHED);
setPriority(OverlayPriority.HIGH);
}
@Override
public Rectangle getBounds()
{
//if this is null there is no reason to draw e.g. switching between resizable and fixed
final Widget viewportWidget = client.getViewportWidget();
if (viewportWidget == null)
{
return new Rectangle();
}
final int queueSize = plugin.getXpGlobesSize();
if (queueSize == 0)
{
return new Rectangle();
}
// Get width of markers
final int markersLength = (queueSize * (config.xpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1));
final int startDrawX;
final int startDrawY;
if (getPreferredLocation() == null)
{
//check the width of the client if we can draw properly
final int clientWidth;
switch (config.centerOrbs())
{
case MIDDLE_CANVAS:
clientWidth = client.getViewportWidth();
break;
case MIDDLE_VIEWPORT:
clientWidth = viewportWidget.getWidth();
break;
case DYNAMIC:
clientWidth = (viewportWidget.getWidth() + client.getViewportWidth()) / 2;
break;
default:
clientWidth = client.getViewportWidth();
break;
}
startDrawX = clientWidth / 2 - markersLength / 2;
startDrawY = DEFAULT_START_Y;
}
else
{
startDrawX = getPreferredLocation().x;
startDrawY = getPreferredLocation().y;
}
return new Rectangle(startDrawX, startDrawY, markersLength, config.xpOrbSize());
setPosition(OverlayPosition.TOP_CENTER);
}
@Override
public Dimension render(Graphics2D graphics)
{
final Rectangle bounds = getBounds();
if (bounds.isEmpty())
final int queueSize = plugin.getXpGlobesSize();
if (queueSize == 0)
{
return null;
}
@@ -147,11 +91,13 @@ public class XpGlobesOverlay extends Overlay
int curDrawX = 0;
for (final XpGlobe xpGlobe : plugin.getXpGlobes())
{
renderProgressCircle(graphics, xpGlobe, curDrawX, 0, bounds);
renderProgressCircle(graphics, xpGlobe, curDrawX, 0, getBounds());
curDrawX += MINIMUM_STEP + config.xpOrbSize();
}
return bounds.getSize();
// Get width of markers
final int markersLength = (queueSize * (config.xpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1));
return new Dimension(markersLength, config.xpOrbSize());
}
private void renderProgressCircle(Graphics2D graphics, XpGlobe skillToDraw, int x, int y, Rectangle bounds)