Changeset 13117 in josm for trunk/src

Timestamp:

2017-11-12T15:45:08+01:00 (6 years ago)

Author:

Don-vip

Message:

see #11217, fix #15541 - hide note tooltip when selected note is no longer visible + drop old url copy code (does not work anymore with new system)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -46 +45 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -199 +197 @@
         displayedWindow.pack();
         displayedWindow.setLocation(tx, ty);
-        displayedWindow.setVisible(true);
+        displayedWindow.setVisible(mv.contains(p));
         displayedNote = selectedNote;
     }
@@ -303 +301 @@
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (SwingUtilities.isRightMouseButton(e) && noteData.getSelectedNote() != null) {
-            final String url = OsmApi.getOsmApi().getBaseUrl() + "notes/" + noteData.getSelectedNote().getId();
-            ClipboardUtils.copyString(url);
-            return;
-        } else if (!SwingUtilities.isLeftMouseButton(e)) {
+        if (!SwingUtilities.isLeftMouseButton(e)) {
             return;
         }