Changeset 562 in josm for trunk/src/org

Timestamp:

2008-02-25T12:41:43+01:00 (17 years ago)

Author:

david

Message:

Show/hide text -> show/hide text/icon, and implement as such

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (1 diff)
• layer/markerlayer/ButtonMarker.java (modified) (2 diffs)
• layer/markerlayer/Marker.java (modified) (1 diff)

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

@@ -103 +103 @@
 
                 public ShowHideMarkerText(Layer layer) {
-                        super(tr("Show/Hide Text"), ImageProvider.get("dialogs", "showhide"));
-                        putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text."));
+                        super(tr("Show/Hide Text/Icons"), ImageProvider.get("dialogs", "showhide"));
+                        putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text and icons."));
                         putValue("help", "Dialog/LayerList/ShowHideMarkerText");
                         this.layer = layer;

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

@@ -25 +25 @@
 
         private Rectangle buttonRectangle;
-        protected Graphics graphicsContext = null;
         
         public ButtonMarker(LatLon ll, String buttonImage, MarkerLayer parentLayer, double time, double offset) {
@@ -44 +43 @@
         
         @Override public void paint(Graphics g, MapView mv, boolean mousePressed, String show) {
-                graphicsContext = g;
+                if (! show.equalsIgnoreCase("show")) {
+                        super.paint(g, mv, mousePressed, show);
+                        return;
+                }
                 Point screen = mv.getPoint(eastNorth);
                 buttonRectangle.setLocation(screen.x+4, screen.y+2);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -169 +169 @@
         public void paint(Graphics g, MapView mv, boolean mousePressed, String show) {
                 Point screen = mv.getPoint(eastNorth);
-                if (symbol != null) {
+                if (symbol != null && show.equalsIgnoreCase("show")) {
                         symbol.paintIcon(mv, g, screen.x-symbol.getIconWidth()/2, screen.y-symbol.getIconHeight()/2);
                 } else {