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

Use correct widget when hiding minimap

Browse Source 
When hiding minimap, there are 2 different widget IDs for respective
resizable mode configurations. Find proper one and hide it.

Fixes #976

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-15 19:25:44 +02:00
parent 4218459617
commit 26daee6a2e
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
View File

@@ -67,13 +67,7 @@ public class MinimapPlugin extends Plugin
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
Widget minimapWidget = client.getWidget(WidgetInfo.MINIMAP_WIDGET); updateMinimapWidgetVisibility(config.hideMinimap());
if (minimapWidget != null)
{
minimapWidget.setHidden(config.hideMinimap());
}
storeOriginalDots(); storeOriginalDots();
replaceMapDots(); replaceMapDots();
} }
@@ -81,13 +75,7 @@ public class MinimapPlugin extends Plugin
@Override @Override
protected void shutDown() throws Exception protected void shutDown() throws Exception
{ {
Widget minimapWidget = client.getWidget(WidgetInfo.MINIMAP_WIDGET); updateMinimapWidgetVisibility(false);
if (minimapWidget != null)
{
minimapWidget.setHidden(false);
}
restoreOriginalDots(); restoreOriginalDots();
} }
@@ -147,12 +135,7 @@ public class MinimapPlugin extends Plugin
if (event.getKey().equals("hideMinimap")) if (event.getKey().equals("hideMinimap"))
{ {
Widget minimapWidget = client.getWidget(WidgetInfo.MINIMAP_WIDGET); updateMinimapWidgetVisibility(config.hideMinimap());
if (minimapWidget != null)
{
minimapWidget.setHidden(config.hideMinimap());
}
return; return;
} }
@@ -162,11 +145,23 @@ public class MinimapPlugin extends Plugin
@Subscribe @Subscribe
public void onWidgetHiddenChange(WidgetHiddenChanged event) public void onWidgetHiddenChange(WidgetHiddenChanged event)
{ {
Widget minimapWidget = client.getWidget(WidgetInfo.MINIMAP_WIDGET); updateMinimapWidgetVisibility(config.hideMinimap());
}
if (event.getWidget() == minimapWidget) private void updateMinimapWidgetVisibility(boolean enable)
{
final Widget resizableStonesWidget = client.getWidget(WidgetInfo.RESIZABLE_MINIMAP_STONES_WIDGET);
if (resizableStonesWidget != null)
{ {
minimapWidget.setHidden(config.hideMinimap()); resizableStonesWidget.setHidden(enable);
}
final Widget resizableNormalWidget = client.getWidget(WidgetInfo.RESIZABLE_MINIMAP_WIDGET);
if (resizableNormalWidget != null && !resizableNormalWidget.isSelfHidden())
{
resizableNormalWidget.setHidden(enable);
} }
} }
@@ -185,5 +180,4 @@ public class MinimapPlugin extends Plugin
mapDots[i] = MinimapDot.create(this.client, minimapDotColors[i]); mapDots[i] = MinimapDot.create(this.client, minimapDotColors[i]);
} }
} }
} }