From 1569ac37318bf3633d1c6b459f851baa69192ab1 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sun, 22 Apr 2012 11:23:41 +0000
Subject: [PATCH] DroidFish: Removed the padding around the chess board. Makes
 it slightly larger.

---
 DroidFish/res/layout-land/main.xml                     |  3 ++-
 DroidFish/res/layout/main.xml                          |  3 ++-
 DroidFish/src/org/petero/droidfish/ChessBoard.java     |  8 ++++----
 .../petero/droidfish/activities/ChessBoardEdit.java    | 10 +++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/DroidFish/res/layout-land/main.xml b/DroidFish/res/layout-land/main.xml
index e9d64aa..29356d6 100644
--- a/DroidFish/res/layout-land/main.xml
+++ b/DroidFish/res/layout-land/main.xml
@@ -13,7 +13,8 @@
 		xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="vertical"
 	    android:layout_width="fill_parent"
-    	android:layout_height="fill_parent">
+    	android:layout_height="fill_parent"
+        android:paddingLeft="1dp">
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
diff --git a/DroidFish/res/layout/main.xml b/DroidFish/res/layout/main.xml
index 3cef430..d9304a1 100644
--- a/DroidFish/res/layout/main.xml
+++ b/DroidFish/res/layout/main.xml
@@ -11,7 +11,8 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
-	    android:layout_height="wrap_content">
+	    android:layout_height="wrap_content"
+	    android:paddingTop="1dp">
 		<TextView
     		android:id="@+id/status"
 	    	android:layout_width="0dp" 
diff --git a/DroidFish/src/org/petero/droidfish/ChessBoard.java b/DroidFish/src/org/petero/droidfish/ChessBoard.java
index 9cf7140..62fe1c1 100644
--- a/DroidFish/src/org/petero/droidfish/ChessBoard.java
+++ b/DroidFish/src/org/petero/droidfish/ChessBoard.java
@@ -346,10 +346,10 @@ public class ChessBoard extends View {
         }
     }
 
-    protected int getWidth(int sqSize) { return sqSize * 8 + 4; }
-    protected int getHeight(int sqSize) { return sqSize * 8 + 4; }
-    protected int getSqSizeW(int width) { return (width - 4) / 8; }
-    protected int getSqSizeH(int height) { return (height - 4) / 8; }
+    protected int getWidth(int sqSize) { return sqSize * 8; }
+    protected int getHeight(int sqSize) { return sqSize * 8; }
+    protected int getSqSizeW(int width) { return (width) / 8; }
+    protected int getSqSizeH(int height) { return (height) / 8; }
 
     protected int getMaxHeightPercentage() { return 75; }
 
diff --git a/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java b/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
index aff4a2b..6e3c3cc 100644
--- a/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
+++ b/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
@@ -39,16 +39,16 @@ public class ChessBoardEdit extends ChessBoard {
         drawSquareLabels = true;
     }
 
-    private final static int gap = 2;
+    private final static int gap = 4;
 
     @Override
-    protected int getWidth(int sqSize) { return sqSize * 8 + 4; }
+    protected int getWidth(int sqSize) { return sqSize * 8; }
     @Override
-    protected int getHeight(int sqSize) { return sqSize * 10 + 4 + gap; }
+    protected int getHeight(int sqSize) { return sqSize * 10 + gap; }
     @Override
-    protected int getSqSizeW(int width) { return (width - 4) / 8; }
+    protected int getSqSizeW(int width) { return (width) / 8; }
     @Override
-    protected int getSqSizeH(int height) { return (height - 4 - gap) / 10; }
+    protected int getSqSizeH(int height) { return (height - gap) / 10; }
     @Override
     protected int getMaxHeightPercentage() { return 85; }