diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-04-29 01:16:25 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-04-29 01:16:25 +0200 |
| commit | 5a0be3261a52f6a0849941283487d08212a35983 (patch) | |
| tree | 4c2d808cb69ca28e0fa8d61d30330fa631fe5207 /src/jrummikub/view/StonePainter.java | |
| parent | 5a7118587f26c6cb54b7d7771fda4a96747e492a (diff) | |
| download | JRummikub-5a0be3261a52f6a0849941283487d08212a35983.tar JRummikub-5a0be3261a52f6a0849941283487d08212a35983.zip | |
Fix some off-by-one painting problems
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@15 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/view/StonePainter.java')
| -rw-r--r-- | src/jrummikub/view/StonePainter.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jrummikub/view/StonePainter.java b/src/jrummikub/view/StonePainter.java index dbdf3c8..8b104df 100644 --- a/src/jrummikub/view/StonePainter.java +++ b/src/jrummikub/view/StonePainter.java @@ -18,7 +18,7 @@ class StonePainter { private static final Color BACKGROUND_COLOR = new Color(0.9f, 0.9f, 0.6f); - public static final float BOARD_SCALE = 75.0f/DEFAULT_WIDTH*ASPECT_RATIO; + public static final float BOARD_SCALE = 75.0f*ASPECT_RATIO/DEFAULT_WIDTH; private static Color getColor(StoneColor color) { @@ -43,7 +43,7 @@ class StonePainter { } int width = (int)(DEFAULT_WIDTH*scale); - int height = (int)(width/ASPECT_RATIO); + int height = (int)(DEFAULT_WIDTH*scale/ASPECT_RATIO); int xpos = (int)(x*width); int ypos = (int)(y*height); @@ -84,6 +84,7 @@ class StonePainter { g.setColor(getColor(stone.getColor())); g.drawString(value, (int)(xpos+width/2-stringRect.getWidth()/2), ypos+height/4+(fm.getAscent()-fm.getDescent())/2); + // Paint circle g.setColor(BACKGROUND_COLOR.darker()); g.drawArc((int)(xpos+width/2-width*CIRCLE_WIDTH/2), (int)(ypos+height*0.65f-width*CIRCLE_WIDTH/2), (int)(width*CIRCLE_WIDTH), (int)(width*CIRCLE_WIDTH), 50, 170); |