Ticket #20564: 20564.patch

plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java

@@ -50 +50 @@
         None, Drawing, DrawingWidth, DrawingAngFix
     }
 
-    private final Cursor cursorCrosshair;
     private final Cursor cursorJoinNode;
     private final Cursor cursorJoinWay;
     private Cursor currCursor;
@@ -70 +69 @@
                 Shortcut.registerShortcut("mapmode:buildings",
                         tr("Mode: {0}", tr("Draw buildings")),
                         KeyEvent.VK_B, Shortcut.DIRECT),
-                getCursor());
+                // Set super.cursor to crosshair without overlay because super.cursor is final,
+                // but we use two different cursors with overlays for rectangular and circular buildings
+                // the actual cursor is drawn in enterMode()
+                ImageProvider.getCursor("crosshair", null));
 
-        cursorCrosshair = getCursor();
+        currCursor = getCursor();
         cursorJoinNode = ImageProvider.getCursor("crosshair", "joinnode");
         cursorJoinWay = ImageProvider.getCursor("crosshair", "joinway");
-        currCursor = cursorCrosshair;
     }
 
     private static Cursor getCursor() {
@@ -133 +134 @@
     @Override
     public void enterMode() {
         super.enterMode();
+        // super.enterMode() draws the basic cursor. Overwrite it immediately with the cursor for the current building mode. 
+        updCursor();
         MapFrame map = MainApplication.getMap();
         if (getLayerManager().getEditDataSet() == null) {
             map.selectSelectTool(false);
             return;
         }
         selectedColor = new NamedColorProperty(marktr("selected"), selectedColor).get();
-        currCursor = cursorCrosshair;
         map.mapView.addMouseListener(this);
         map.mapView.addMouseMotionListener(this);
         map.mapView.addTemporaryLayer(this);
@@ -385 +387 @@
     }
 
     private void updCursor() {
-        if (mousePos == null)
-            return;
         if (!MainApplication.isDisplayingMapView())
             return;
-        Node n = null;
-        if (!ctrl) {
-            n = MainApplication.getMap().mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
+
+        if (!ctrl && (mousePos != null)) {
+            Node n = MainApplication.getMap().mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
             if (n != null) {
                 setCursor(cursorJoinNode);
                 return;