From bb4da0b822ea82a04b428755af2072f80ab250fd Mon Sep 17 00:00:00 2001
From: psikoi <ruben.amendoeira@gmail.com>
Date: Sat, 29 Jun 2019 11:47:00 +0100
Subject: [PATCH 1/2] Add ENTER/ESC key events for screenmarker saving

---
 .../screenmarkers/ui/ScreenMarkerPanel.java   | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
index d225410209..b0270ba49d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
@@ -29,6 +29,8 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
@@ -169,12 +171,7 @@ class ScreenMarkerPanel extends JPanel
 			@Override
 			public void mousePressed(MouseEvent mouseEvent)
 			{
-				marker.getMarker().setName(nameInput.getText());
-				plugin.updateConfig();
-
-				nameInput.setEditable(false);
-				updateNameActions(false);
-				requestFocusInWindow();
+				save();
 			}
 
 			@Override
@@ -198,10 +195,7 @@ class ScreenMarkerPanel extends JPanel
 			@Override
 			public void mousePressed(MouseEvent mouseEvent)
 			{
-				nameInput.setEditable(false);
-				nameInput.setText(marker.getMarker().getName());
-				updateNameActions(false);
-				requestFocusInWindow();
+				cancel();
 			}
 
 			@Override
@@ -252,6 +246,21 @@ class ScreenMarkerPanel extends JPanel
 		nameInput.setPreferredSize(new Dimension(0, 24));
 		nameInput.getTextField().setForeground(Color.WHITE);
 		nameInput.getTextField().setBorder(new EmptyBorder(0, 8, 0, 0));
+		nameInput.addKeyListener(new KeyAdapter()
+		{
+			@Override
+			public void keyPressed(KeyEvent e)
+			{
+				if (e.getKeyCode() == KeyEvent.VK_ENTER)
+				{
+					save();
+				}
+				else if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
+				{
+					cancel();
+				}
+			}
+		});
 
 		nameWrapper.add(nameInput, BorderLayout.CENTER);
 		nameWrapper.add(nameActions, BorderLayout.EAST);
@@ -424,6 +433,24 @@ class ScreenMarkerPanel extends JPanel
 
 	}
 
+	private void save()
+	{
+		marker.getMarker().setName(nameInput.getText());
+		plugin.updateConfig();
+
+		nameInput.setEditable(false);
+		updateNameActions(false);
+		requestFocusInWindow();
+	}
+
+	private void cancel()
+	{
+		nameInput.setEditable(false);
+		nameInput.setText(marker.getMarker().getName());
+		updateNameActions(false);
+		requestFocusInWindow();
+	}
+
 	private void updateNameActions(boolean saveAndCancel)
 	{
 		save.setVisible(saveAndCancel);

From ba3edc1ecbf2a9dcbce5ea220a4f8d5211413518 Mon Sep 17 00:00:00 2001
From: psikoi <ruben.amendoeira@gmail.com>
Date: Sat, 29 Jun 2019 12:31:17 +0100
Subject: [PATCH 2/2] Add hover preview to screen markers

---
 .../screenmarkers/ui/ScreenMarkerPanel.java   | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
index b0270ba49d..23b6cad174 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
@@ -261,6 +261,20 @@ class ScreenMarkerPanel extends JPanel
 				}
 			}
 		});
+		nameInput.getTextField().addMouseListener(new MouseAdapter()
+		{
+			@Override
+			public void mouseEntered(MouseEvent mouseEvent)
+			{
+				preview(true);
+			}
+
+			@Override
+			public void mouseExited(MouseEvent mouseEvent)
+			{
+				preview(false);
+			}
+		});
 
 		nameWrapper.add(nameInput, BorderLayout.CENTER);
 		nameWrapper.add(nameActions, BorderLayout.EAST);
@@ -368,10 +382,7 @@ class ScreenMarkerPanel extends JPanel
 			@Override
 			public void mousePressed(MouseEvent mouseEvent)
 			{
-				visible = !visible;
-				marker.getMarker().setVisible(visible);
-				plugin.updateConfig();
-				updateVisibility();
+				toggle(!visible);
 			}
 
 			@Override
@@ -433,6 +444,24 @@ class ScreenMarkerPanel extends JPanel
 
 	}
 
+	private void preview(boolean on)
+	{
+		if (visible)
+		{
+			return;
+		}
+
+		marker.getMarker().setVisible(on);
+	}
+
+	private void toggle(boolean on)
+	{
+		visible = on;
+		marker.getMarker().setVisible(visible);
+		plugin.updateConfig();
+		updateVisibility();
+	}
+
 	private void save()
 	{
 		marker.getMarker().setName(nameInput.getText());