From: gitknilch <gitknilch@cwde.de>
Date: Sat, 30 Mar 2013 07:39:47 +0000 (+0100)
Subject: use "traditional" tileset from libkmahjongg, with bigger resolution
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/commitdiff_plain/a42b53817392914f9df9f07b74d4cdf2b29aca2c

use "traditional" tileset from libkmahjongg, with bigger resolution
remove old tileset for now
---

diff --git a/res/drawable/tileset.png b/res/drawable/tileset.png
deleted file mode 100644
index b4286a7..0000000
Binary files a/res/drawable/tileset.png and /dev/null differ
diff --git a/res/drawable/traditional.png b/res/drawable/traditional.png
new file mode 100644
index 0000000..9555304
Binary files /dev/null and b/res/drawable/traditional.png differ
diff --git a/src/de/cwde/freeshisen/ShisenShoView.java b/src/de/cwde/freeshisen/ShisenShoView.java
index 6f567ce..b802f0d 100644
--- a/src/de/cwde/freeshisen/ShisenShoView.java
+++ b/src/de/cwde/freeshisen/ShisenShoView.java
@@ -111,7 +111,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	private void loadTileset() {
 		BitmapFactory.Options ops = new BitmapFactory.Options();
 		ops.inScaled = false;
-		Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.tileset, ops);
+		Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.traditional, ops);
 		tileset.setDensity(Bitmap.DENSITY_NONE);
 
 		// The tile set has 4 rows x 9 columns
@@ -124,8 +124,8 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		// align to screen:
 		// "large" is 16x6, and we want to have a nice border, so we use 17x7 and
 		// choose the lowest scale so everything fits
-		float scalex = ((float) screenWidth/17) / loadedtileWidth;
-		float scaley = ((float) screenHeight/7) / loadedtileHeight;
+		float scalex = ((float) (screenWidth - 2)/17) / loadedtileWidth;
+		float scaley = ((float) (screenHeight - 2)/7) / loadedtileHeight;
 		if (scaley < scalex) {
 			scalex = scaley;
 		} else {