From c4d7626ae1fbb1d62db0db271abc999427be7981 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 18 Aug 2016 12:00:18 -0700
Subject: [PATCH] tweak toolbar layout to fit better

---
 xwords4/android/XWords4/res/values-large/styles.xml      | 9 ---------
 xwords4/android/XWords4/res/values/styles.xml            | 5 +++--
 .../src/org/eehouse/android/xw4/BoardContainer.java      | 8 ++++----
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 xwords4/android/XWords4/res/values-large/styles.xml

diff --git a/xwords4/android/XWords4/res/values-large/styles.xml b/xwords4/android/XWords4/res/values-large/styles.xml
deleted file mode 100644
index a29b34e33..000000000
--- a/xwords4/android/XWords4/res/values-large/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="toolbar_button">
-      <item name="android:layout_width">wrap_content</item>
-      <item name="android:layout_height">wrap_content</item>
-      <item name="android:layout_weight">1</item>
-    </style>
-</resources>
-
diff --git a/xwords4/android/XWords4/res/values/styles.xml b/xwords4/android/XWords4/res/values/styles.xml
index e97d95284..d99e7e7b7 100644
--- a/xwords4/android/XWords4/res/values/styles.xml
+++ b/xwords4/android/XWords4/res/values/styles.xml
@@ -38,9 +38,10 @@
     </style>
 
     <style name="toolbar_button">
-      <item name="android:layout_width">@dimen/tb_button_width</item>
-      <item name="android:layout_height">@dimen/tb_button_height</item>
+      <item name="android:layout_width">match_parent</item>
+      <item name="android:layout_height">match_parent</item>
       <item name="android:layout_weight">1</item>
+      <item name="android:scaleType">fitCenter</item>
     </style>
 
     <style name="about_items">
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java
index 0a3e7bf06..e7f4a39c2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardContainer.java
@@ -35,8 +35,8 @@ public class BoardContainer extends ViewGroup {
     // If the ratio of height/width exceeds this, use portrait layout
     private static final int PORTRAIT_THRESHHOLD = 105;
 
-    private static final int BOARD_PCT_HOR = 90;
-    private static final int BOARD_PCT_VERT = 85;
+    private static final int BOARD_PCT_VERT = 90;
+    private static final int BOARD_PCT_HOR = 85;
 
     private static final int BOARD_INDX = 0;
     private static final int EXCH_INDX = 1;
@@ -157,8 +157,8 @@ public class BoardContainer extends ViewGroup {
     private Rect[] figureBounds( int left, int top, int width, int height )
     {
         int boardHeight = ( haveTradeBar() || s_isPortrait)
-            ? height * BOARD_PCT_HOR / 100 : height;
-        int boardWidth = s_isPortrait ? width : width * BOARD_PCT_VERT / 100;
+            ? height * (BOARD_PCT_VERT) / 100 : height;
+        int boardWidth = s_isPortrait ? width : (width * BOARD_PCT_HOR) / 100;
 
         // board
         Rect boardBounds = new Rect( left, top, left + boardWidth,