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

Screen Markers: use new color picker

Browse Source 
Co-authored-by: psikoi <ruben.amendoeira@gmail.com>
This commit is contained in:
Ron Young
2019-01-03 11:06:41 -06:00
parent 2a76a23548
commit 5140f481cc
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
View File

@@ -36,14 +36,13 @@ import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JColorChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerModel;
import javax.swing.SpinnerNumberModel;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
@@ -53,6 +52,7 @@ import net.runelite.client.plugins.screenmarkers.ScreenMarkerPlugin;
import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.components.FlatTextField;
import net.runelite.client.ui.components.colorpicker.RuneliteColorPicker;
import net.runelite.client.util.ImageUtil;
class ScreenMarkerPanel extends JPanel
@@ -489,17 +489,16 @@ class ScreenMarkerPanel extends JPanel
private void openFillColorPicker()
{
final JFrame parent = new JFrame();
JColorChooser jColorChooser = new JColorChooser(marker.getMarker().getFill());
jColorChooser.getSelectionModel().addChangeListener(e1 ->
RuneliteColorPicker colorPicker = new RuneliteColorPicker(SwingUtilities.windowForComponent(this),
marker.getMarker().getFill(), marker.getMarker().getName() + " Fill", false);
colorPicker.setLocation(getLocationOnScreen());
colorPicker.setOnColorChange(c ->
{
Color chosen = jColorChooser.getColor();
marker.getMarker().setFill(new Color(chosen.getRed(), chosen.getGreen(), chosen.getBlue(), DEFAULT_FILL_OPACITY));
marker.getMarker().setFill(c);
updateFill();
});
parent.addWindowListener(new WindowAdapter()
colorPicker.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
@@ -507,25 +506,21 @@ class ScreenMarkerPanel extends JPanel
plugin.updateConfig();
}
});
parent.add(jColorChooser);
parent.pack();
parent.setLocationRelativeTo(null);
parent.setVisible(true);
colorPicker.setVisible(true);
}
private void openBorderColorPicker()
{
final JFrame parent = new JFrame();
JColorChooser jColorChooser = new JColorChooser(marker.getMarker().getColor());
jColorChooser.getSelectionModel().addChangeListener(e1 ->
RuneliteColorPicker colorPicker = new RuneliteColorPicker(SwingUtilities.windowForComponent(this),
marker.getMarker().getColor(), marker.getMarker().getName() + " Border", false);
colorPicker.setLocation(getLocationOnScreen());
colorPicker.setOnColorChange(c ->
{
marker.getMarker().setColor(jColorChooser.getColor());
marker.getMarker().setColor(c);
updateBorder();
});
parent.addWindowListener(new WindowAdapter()
colorPicker.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
@@ -533,10 +528,6 @@ class ScreenMarkerPanel extends JPanel
plugin.updateConfig();
}
});
parent.add(jColorChooser);
parent.pack();
parent.setLocationRelativeTo(null);
parent.setVisible(true);
colorPicker.setVisible(true);
}
}