From 7e002ff6c267b87b46493039397da912a1735eb5 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Wed, 27 Nov 2024 19:02:13 +0100
Subject: [PATCH] Theme Editor: fixed using color picker on secondary screen

---
 CHANGELOG.md                                       |  1 +
 .../flatlaf/themeeditor/FlatColorPipette.java      | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab97f69..37ed6891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ FlatLaf Change Log
     when resizing window. (issue #907)
 - Popup: On Windows 10, fixed misplaced popup drop shadow. (issue #911;
   regression in 3.5)
+- Theme Editor: Fixed using color picker on secondary screen.
 
 
 ## 3.5.2
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatColorPipette.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatColorPipette.java
index 25d8dd1a..b8e54ee9 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatColorPipette.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatColorPipette.java
@@ -23,9 +23,11 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Robot;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -97,16 +99,18 @@ class FlatColorPipette
 			// macOS: windows with opacity smaller than 0.05 does not receive
 			//        mouse clicked/pressed/released events (but mouse moved events)
 			setOpacity( SystemInfo.isMacOS ? 0.05f : 0.005f );
-			setBounds( owner.getGraphicsConfiguration().getBounds() );
+			GraphicsConfiguration gc = owner.getGraphicsConfiguration();
+			setBounds( (gc != null) ? gc.getBounds() : new Rectangle( Toolkit.getDefaultToolkit().getScreenSize() ) );
 
-			robot = new Robot( owner.getGraphicsConfiguration().getDevice() );
+			robot = (gc != null) ? new Robot( gc.getDevice() ) : new Robot();
 			magnifier = new Magnifier( this, robot );
 
 			MouseAdapter mouseListener = new MouseAdapter() {
 				@Override
 				public void mouseMoved( MouseEvent e ) {
-					lastX = e.getX();
-					lastY = e.getY();
+					// adding location of pick window is necessary for secondary screens
+					lastX = e.getX() + getX();
+					lastY = e.getY() + getY();
 
 					// get color at mouse location
 					// (temporary change opacity to zero to get correct color from robot)
@@ -133,7 +137,7 @@ class FlatColorPipette
 						// --> use last hover color on macOS
 						color = SystemInfo.isMacOS
 							? lastHoverColor
-							: robot.getPixelColor( e.getX(), e.getY() );
+							: robot.getPixelColor( e.getX() + getX(), e.getY() + getY() );
 					}
 					pick( color );
 				}