Changeset 13181 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-12-02T15:13:32+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15599 - Improvements for testing painting (last patches by ris)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapViewState.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -3 +3 @@
 
 import java.awt.Container;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.geom.AffineTransform;
@@ -145 +146 @@
 
     private static Point findTopLeftOnScreen(JComponent position) {
-        try {
-            return position.getLocationOnScreen();
-        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-            throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
+        if (GraphicsEnvironment.isHeadless()) {
+            // in our imaginary universe the window is always (10, 10) from the top left of the screen
+            Point topLeftInWindow = findTopLeftInWindow(position);
+            return new Point(topLeftInWindow.x + 10, topLeftInWindow.y + 10);
+        } else {
+            try {
+                return position.getLocationOnScreen();
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+                throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -3 +3 @@
 
 import java.awt.Cursor;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -320 +321 @@
 
     protected boolean isVisibleOnScreen() {
-        return SwingUtilities.getWindowAncestor(this) != null && isShowing();
+        return GraphicsEnvironment.isHeadless() || (
+            SwingUtilities.getWindowAncestor(this) != null && isShowing()
+        );
     }