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

RuneliteColorPicker: add onClose consumer

Browse Source
This commit is contained in:
Ron Young
2019-02-23 16:43:14 -06:00
committed by Tomas Slusny
parent 5844c7c5de
commit dc1e409f09
3 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -429,15 +429,7 @@ public class ConfigPanel extends PluginPanel
colorPickerBtn.setBackground(c); colorPickerBtn.setBackground(c);
colorPickerBtn.setText(ColorUtil.toHexColor(c).toUpperCase()); colorPickerBtn.setText(ColorUtil.toHexColor(c).toUpperCase());
}); });
colorPicker.setOnClose(c -> changeConfiguration(listItem, config, colorPicker, cd, cid));
colorPicker.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
{
changeConfiguration(listItem, config, colorPicker, cd, cid);
}
});
colorPicker.setVisible(true); colorPicker.setVisible(true);
} }
}); });

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

@@ -553,15 +553,7 @@ class ScreenMarkerPanel extends JPanel
marker.getMarker().setFill(c); marker.getMarker().setFill(c);
updateFill(); updateFill();
}); });
colorPicker.setOnClose(c -> plugin.updateConfig());
colorPicker.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
{
plugin.updateConfig();
}
});
colorPicker.setVisible(true); colorPicker.setVisible(true);
} }
@@ -575,15 +567,7 @@ class ScreenMarkerPanel extends JPanel
marker.getMarker().setColor(c); marker.getMarker().setColor(c);
updateBorder(); updateBorder();
}); });
colorPicker.setOnClose(c -> plugin.updateConfig());
colorPicker.addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
{
plugin.updateConfig();
}
});
colorPicker.setVisible(true); colorPicker.setVisible(true);
} }
} }

17
runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/RuneliteColorPicker.java
View File

@@ -39,6 +39,8 @@ import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.function.Consumer; import java.util.function.Consumer;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JFrame; import javax.swing.JFrame;
@@ -84,6 +86,9 @@ public class RuneliteColorPicker extends JDialog
@Setter @Setter
private Consumer<Color> onColorChange; private Consumer<Color> onColorChange;
@Setter
private Consumer<Color> onClose;
public RuneliteColorPicker(Window parent, Color previousColor, String title, boolean alphaHidden) public RuneliteColorPicker(Window parent, Color previousColor, String title, boolean alphaHidden)
{ {
super(parent, "RuneLite Color Picker - " + title, ModalityType.MODELESS); super(parent, "RuneLite Color Picker - " + title, ModalityType.MODELESS);
@@ -265,6 +270,18 @@ public class RuneliteColorPicker extends JDialog
updatePanels(); updatePanels();
updateText(); updateText();
addWindowListener(new WindowAdapter()
{
@Override
public void windowClosing(WindowEvent e)
{
if (onClose != null)
{
onClose.accept(selectedColor);
}
}
});
} }
private void updatePanels() private void updatePanels()