Changeset 3740 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-12-23T15:38:34+01:00 (13 years ago)

Author:

Upliner

Message:

Make TMS info text more clearly visible

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (11 diffs)

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

@@ -145 +145 @@
     private String attrTermsUrl;
     private Rectangle attrImageBounds, attrToUBounds;
+    private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
     private static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
     private static final Font ATTR_LINK_FONT;
@@ -832 +833 @@
     }
 
+    void myDrawString(Graphics g, String text, int x, int y) {
+        Color oldColor = g.getColor();
+        g.setColor(Color.black);
+        g.drawString(text,x+1,y+1);
+        g.setColor(oldColor);
+        g.drawString(text,x,y);
+    }
+
     void paintTileText(TileSet ts, Tile tile, Graphics g, MapView mv, int zoom, Tile t) {
         int fontHeight = g.getFontMetrics().getHeight();
@@ -840 +849 @@
 
         if (PROP_DRAW_DEBUG.get()) {
-            g.drawString("x=" + t.getXtile() + " y=" + t.getYtile() + " z=" + zoom + "", p.x + 2, texty);
+            myDrawString(g, "x=" + t.getXtile() + " y=" + t.getYtile() + " z=" + zoom + "", p.x + 2, texty);
             texty += 1 + fontHeight;
             if ((t.getXtile() % 32 == 0) && (t.getYtile() % 32 == 0)) {
-                g.drawString("x=" + t.getXtile() / 32 + " y=" + t.getYtile() / 32 + " z=7", p.x + 2, texty);
+                myDrawString(g, "x=" + t.getXtile() / 32 + " y=" + t.getYtile() / 32 + " z=7", p.x + 2, texty);
                 texty += 1 + fontHeight;
             }
@@ -851 +860 @@
             String md = tile.toString();
             if (md != null) {
-                g.drawString(md, p.x + 2, texty);
+                myDrawString(g, md, p.x + 2, texty);
                 texty += 1 + fontHeight;
             }
@@ -857 +866 @@
             if (meta != null) {
                 for (Map.Entry<String, String> entry : meta.entrySet()) {
-                    g.drawString(entry.getKey() + ": " + entry.getValue(), p.x + 2, texty);
+                    myDrawString(g, entry.getKey() + ": " + entry.getValue(), p.x + 2, texty);
                     texty += 1 + fontHeight;
                 }
@@ -865 +874 @@
         String tileStatus = tile.getStatus();
         if (!tile.isLoaded() && PROP_DRAW_DEBUG.get()) {
-            g.drawString(tr("image " + tileStatus), p.x + 2, texty);
+            myDrawString(g, tr("image " + tileStatus), p.x + 2, texty);
             texty += 1 + fontHeight;
         }
@@ -1122 +1131 @@
         }
         g.setColor(Color.red);
+        g.setFont(InfoFont);
 
         // The current zoom tileset is guaranteed to have all of
@@ -1133 +1143 @@
             Font font = g.getFont();
             g.setFont(ATTR_LINK_FONT);
+            g.setColor(Color.white);
 
             // Draw terms of use text
@@ -1143 +1154 @@
                 int y = mv.getHeight() - textHeight;
                 attrToUBounds = new Rectangle(x, y, textWidth, textHeight);
-                g.setColor(Color.black);
-                g.drawString("Background Terms of Use", x+1, y+1);
-                g.setColor(Color.white);
-                g.drawString("Background Terms of Use", x, y);
+                myDrawString(g, "Background Terms of Use", x, y);
             }
 
@@ -1166 +1174 @@
                 int x = mv.getWidth() - (int) stringBounds.getWidth();
                 int y = mv.getHeight() - textHeight;
-                g.setColor(Color.black);
-                g.drawString(attributionText, x+1, y+1);
-                g.setColor(Color.white);
-                g.drawString(attributionText, x, y);
+                myDrawString(g, attributionText, x, y);
             }
 
@@ -1197 +1202 @@
         g.setColor(Color.black);
         if (ts.insane()) {
-            g.drawString("zoom in to load any tiles", 120, 120);
+            myDrawString(g, "zoom in to load any tiles", 120, 120);
         } else if (ts.tooLarge()) {
-            g.drawString("zoom in to load more tiles", 120, 120);
+            myDrawString(g, "zoom in to load more tiles", 120, 120);
         } else if (ts.tooSmall()) {
-            g.drawString("increase zoom level to see more detail", 120, 120);
+            myDrawString(g, "increase zoom level to see more detail", 120, 120);
         }
     }// end of paint method