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

screenmarkers: optimize panel rebuilding

Browse Source 
This fixes panel rebuilding adding multiple mouse input listeners
This commit is contained in:
Adam
2019-10-08 09:08:57 -04:00
parent f780092ec4
commit 7ea68d7e72
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
View File

@@ -108,7 +108,7 @@ public class ScreenMarkerPlugin extends Plugin
loadConfig(configManager.getConfiguration(CONFIG_GROUP, CONFIG_KEY)).forEach(screenMarkers::add); loadConfig(configManager.getConfiguration(CONFIG_GROUP, CONFIG_KEY)).forEach(screenMarkers::add);
screenMarkers.forEach(overlayManager::add); screenMarkers.forEach(overlayManager::add);
pluginPanel = injector.getInstance(ScreenMarkerPluginPanel.class); pluginPanel = new ScreenMarkerPluginPanel(this);
pluginPanel.rebuild(); pluginPanel.rebuild();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), ICON_FILE); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), ICON_FILE);

56
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java
View File

@@ -25,8 +25,6 @@
*/ */
package net.runelite.client.plugins.screenmarkers.ui; package net.runelite.client.plugins.screenmarkers.ui;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@@ -48,7 +46,6 @@ import net.runelite.client.ui.PluginPanel;
import net.runelite.client.ui.components.PluginErrorPanel; import net.runelite.client.ui.components.PluginErrorPanel;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
@Singleton
public class ScreenMarkerPluginPanel extends PluginPanel public class ScreenMarkerPluginPanel extends PluginPanel
{ {
private static final ImageIcon ADD_ICON; private static final ImageIcon ADD_ICON;
@@ -62,9 +59,9 @@ public class ScreenMarkerPluginPanel extends PluginPanel
private final JLabel addMarker = new JLabel(ADD_ICON); private final JLabel addMarker = new JLabel(ADD_ICON);
private final JLabel title = new JLabel(); private final JLabel title = new JLabel();
private final PluginErrorPanel noMarkersPanel = new PluginErrorPanel(); private final PluginErrorPanel noMarkersPanel = new PluginErrorPanel();
private final JPanel markerView = new JPanel(new GridBagLayout());
@Inject private final ScreenMarkerPlugin plugin;
private ScreenMarkerPlugin plugin;
@Getter @Getter
private Color selectedColor = DEFAULT_BORDER_COLOR; private Color selectedColor = DEFAULT_BORDER_COLOR;
@@ -85,8 +82,10 @@ public class ScreenMarkerPluginPanel extends PluginPanel
ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
} }
public void init() public ScreenMarkerPluginPanel(ScreenMarkerPlugin screenMarkerPlugin)
{ {
this.plugin = screenMarkerPlugin;
setLayout(new BorderLayout()); setLayout(new BorderLayout());
setBorder(new EmptyBorder(10, 10, 10, 10)); setBorder(new EmptyBorder(10, 10, 10, 10));
@@ -102,7 +101,6 @@ public class ScreenMarkerPluginPanel extends PluginPanel
JPanel centerPanel = new JPanel(new BorderLayout()); JPanel centerPanel = new JPanel(new BorderLayout());
centerPanel.setBackground(ColorScheme.DARK_GRAY_COLOR); centerPanel.setBackground(ColorScheme.DARK_GRAY_COLOR);
JPanel markerView = new JPanel(new GridBagLayout());
markerView.setBackground(ColorScheme.DARK_GRAY_COLOR); markerView.setBackground(ColorScheme.DARK_GRAY_COLOR);
GridBagConstraints constraints = new GridBagConstraints(); GridBagConstraints constraints = new GridBagConstraints();
@@ -111,24 +109,9 @@ public class ScreenMarkerPluginPanel extends PluginPanel
constraints.gridx = 0; constraints.gridx = 0;
constraints.gridy = 0; constraints.gridy = 0;
for (final ScreenMarkerOverlay marker : plugin.getScreenMarkers())
{
markerView.add(new ScreenMarkerPanel(plugin, marker), constraints);
constraints.gridy++;
markerView.add(Box.createRigidArea(new Dimension(0, 10)), constraints);
constraints.gridy++;
}
noMarkersPanel.setContent("Screen Markers", "Highlight a region on your screen."); noMarkersPanel.setContent("Screen Markers", "Highlight a region on your screen.");
noMarkersPanel.setVisible(false); noMarkersPanel.setVisible(false);
if (plugin.getScreenMarkers().isEmpty())
{
noMarkersPanel.setVisible(true);
title.setVisible(false);
}
markerView.add(noMarkersPanel, constraints); markerView.add(noMarkersPanel, constraints);
constraints.gridy++; constraints.gridy++;
@@ -168,10 +151,35 @@ public class ScreenMarkerPluginPanel extends PluginPanel
public void rebuild() public void rebuild()
{ {
removeAll(); GridBagConstraints constraints = new GridBagConstraints();
constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.weightx = 1;
constraints.gridx = 0;
constraints.gridy = 0;
markerView.removeAll();
for (final ScreenMarkerOverlay marker : plugin.getScreenMarkers())
{
markerView.add(new ScreenMarkerPanel(plugin, marker), constraints);
constraints.gridy++;
markerView.add(Box.createRigidArea(new Dimension(0, 10)), constraints);
constraints.gridy++;
}
boolean empty = constraints.gridy == 0;
noMarkersPanel.setVisible(empty);
title.setVisible(!empty);
markerView.add(noMarkersPanel, constraints);
constraints.gridy++;
markerView.add(creationPanel, constraints);
constraints.gridy++;
repaint(); repaint();
revalidate(); revalidate();
init();
} }
/* Enables/Disables new marker creation mode */ /* Enables/Disables new marker creation mode */