fixed AER display. fixed button collapse when no lables.

Author: rich-murphey

src/FingerPanel.java

@@ -74,7 +74,6 @@ public FingerPanel (KeyMap keys, TwidorPreference pref ) {
 
 		{
 			JPanel panel = new JPanel();
-			setMinimumSize(new Dimension(twiddlerX / 2, windowY / 8));
 			panel.setComponentOrientation( keyOrient );
 			panel.setLayout(new GridLayout(0, (pref.show_SCC && pref.show_key_labels) ? 12 : 3, 1, 4));
 			panel.setBackground(twiddlerBackground);
@@ -135,6 +134,7 @@ else if (finger > chordFinger) {
 					{			// single button keymap
 						int buttons = KeyElement.buttonMask(finger, fingerCol);
 						JPanel subPanel = new JPanel();
+						subPanel.setPreferredSize(new Dimension(buttonX, buttonY));
 						subPanel.setBackground(buttonBackground);
 						subPanel.setLayout(new GridLayout(3, 1));
 						// Color color = keyRed;

src/Stats.java

@@ -131,7 +131,7 @@ public void addPressed (KeyElement pressed, long time) {
 			typed = typed.substring(0, typed.length() - 1);
 		} else {
 			transcribedInput.add(new StatsElement(pressed, time));
-			typed += (char)pressed.getKeycode();
+			typed += pressed.getMacro();
 		}
 	}
 

src/TwidorConstants.java

@@ -60,8 +60,8 @@ public interface TwidorConstants {
 	/**
 	 * button attributes
 	 */
-	public static final int buttonX = (twiddlerX - 30) / 6;
-	public static final int buttonY = windowY * 2 / 15; // 2/3 of 1/4 of 4/5 of windowY
+	public static final int buttonX = twiddlerX / 6;
+	public static final int buttonY = windowY * 2 / 15; // 2/15 = 2/3 of 1/4 of 4/5
 	public static final Color buttonBackground		= Color.getHSBColor(0.f, 0.f, 0.95f);
 	public static final Color buttonHighlight		= Color.getHSBColor(0.f, .2f, 1.f);
 	public static final Color mccHighlight  		= Color.getHSBColor(0.f, .2f, 1.f);