Changeset 5958 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

Timestamp:

2013-05-13T03:10:05+02:00 (11 years ago)

Author:

Don-vip

Message:

• Improve PopupMenuLauncher to automatically select JTable/JList/JTree line under cursor
• Simplify all popup menus with this new feature
• Remove custom popup menus in BoundingBoxSelection and BoundingBoxSelection to use default text field popup menus recently introduced
• Fix EDT violations in changeset window
• Make Autoscale actions publicly available in MainMenu
• Add a new "Zoom to problem" mode in AutoScaleAction
• Make "Zoom to problem" menu item in validator dialog use this new feature
• Update enabled state of "Zoom to Conflict" and "Zoom to problem" against selection of conflict/validator dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -694 +694 @@
             if (cbWireframe.isSelected())
                 return;
-            Point p = evt.getPoint();
-            int index = tblStyles.rowAtPoint(p);
-            if (index < 0) return;
-            if (!tblStyles.getCellRect(index, 1, false).contains(evt.getPoint()))
-                return;
-            if (!tblStyles.isRowSelected(index)) {
-                tblStyles.setRowSelectionInterval(index, index);
-            }
-            MapPaintPopup menu = new MapPaintPopup();
-            menu.show(tblStyles, p.x, p.y);
-        }
-    }
-
+            super.launch(evt);
+        }
+
+        @Override
+        protected void showMenu(MouseEvent evt) {
+            menu = new MapPaintPopup();
+            super.showMenu(evt);
+        }
+    }
+
+    /**
+     * The popup menu displayed when right-clicking a map paint entry
+     */
     public class MapPaintPopup extends JPopupMenu {
         /**