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

Add support for RS movable widgets

Browse Source 
Add support for adding RS widgets to RuneLite overlay system and make
them moveable with persisted positions during restarts.

Depends on #3820 for widget ids

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-07-21 00:04:07 +02:00
parent 2627f08f18
commit a3ddd47a29
2 changed files with 141 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -57,6 +57,7 @@ import net.runelite.client.ui.ClientUI;
import net.runelite.client.ui.DrawManager;
import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.OverlayRenderer;
import net.runelite.client.ui.overlay.WidgetOverlay;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay;
import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
@@ -260,6 +261,7 @@ public class RuneLite
if (!isOutdated)
{
eventBus.register(itemManager.get());
WidgetOverlay.createOverlays(client).forEach(overlayManager::add);
}
// Add core overlays after configuration has been loaded so their properties will be

139
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java Normal file
View File

@@ -0,0 +1,139 @@
/*
* Copyright (c) 2018, Tomas Slusny <slusnucky@gmail.com>
* 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.ui.overlay;
import com.google.common.collect.ImmutableSet;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import net.runelite.api.Client;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
public class WidgetOverlay extends Overlay
{
private static final Set<WidgetInfo> WIDGETS = ImmutableSet.of(
WidgetInfo.RESIZABLE_MINIMAP_WIDGET,
WidgetInfo.RESIZABLE_MINIMAP_STONES_WIDGET,
WidgetInfo.EXPERIENCE_TRACKER_WIDGET
);
public static Set<WidgetOverlay> createOverlays(final Client client)
{
return WIDGETS.stream().map(w -> new WidgetOverlay(client, w)).collect(Collectors.toSet());
}
private final Client client;
private final WidgetInfo widgetInfo;
private Integer toRestoreX;
private Integer toRestoreY;
private WidgetOverlay(final Client client, final WidgetInfo widgetInfo)
{
this.client = client;
this.widgetInfo = widgetInfo;
setLayer(OverlayLayer.UNDER_WIDGETS);
setPosition(OverlayPosition.DETACHED);
}
@Override
public String getName()
{
return Objects.toString(widgetInfo);
}
@Override
public Rectangle getBounds()
{
final Widget widget = client.getWidget(widgetInfo);
if (widget != null && !widget.isHidden())
{
return new Rectangle(
widget.getOriginalX() + widget.getRelativeX(),
widget.getOriginalY() + widget.getRelativeY(),
widget.getWidth(), widget.getHeight());
}
return new Rectangle();
}
@Override
public Dimension render(Graphics2D graphics)
{
final Widget widget = client.getWidget(widgetInfo);
if (widget == null || widget.isHidden())
{
return null;
}
if (getPreferredLocation() == null)
{
if (toRestoreX != null)
{
widget.setRelativeX(toRestoreX);
toRestoreX = null;
}
if (toRestoreY != null)
{
widget.setRelativeY(toRestoreY);
toRestoreY = null;
}
return null;
}
final Rectangle bounds = getBounds();
int x = getPreferredLocation().x - widget.getOriginalX();
int y = getPreferredLocation().y - widget.getOriginalY();
x = Math.max(0, x);
y = Math.max(0, y);
final Widget parent = widget.getParent();
final Dimension dimensions = parent == null ? client.getRealDimensions() : new Dimension(parent.getWidth(), parent.getHeight());
x = Math.min(dimensions.width - bounds.width, x);
y = Math.min(dimensions.height - bounds.height, y);
if (toRestoreX == null)
{
toRestoreX = widget.getRelativeX();
}
if (toRestoreY == null)
{
toRestoreY = widget.getRelativeY();
}
widget.setRelativeX(x);
widget.setRelativeY(y);
return null;
}
}