From 4a25517b81fea070400ab66d8f3b860b5e34772f Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 23 Apr 2016 03:01:27 -0400
Subject: [PATCH] v0.3.5: changes to accommodate hungarian

---
 assets/pixelfont.ttf                          | Bin 79928 -> 79880 bytes
 .../windows/WndLangs.java                     |  47 +++++++++++-------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/assets/pixelfont.ttf b/assets/pixelfont.ttf
index 851a2ee4b1d1ea33882465add4ca569bc7bd996d..c2ced17297022c219c9a3dc20797b393f81505bc 100644
GIT binary patch
delta 1938
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
Dx-_!>

delta 1992
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

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
index e6633f050..d0a3cf703 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
@@ -38,13 +38,14 @@ import java.util.Locale;
 
 public class WndLangs extends Window {
 
-	private int WIDTH = 120;
+	private int WIDTH_P = 120;
+	private int WIDTH_L = 171;
+
+	private int MIN_HEIGHT = 110;
+
 	private int BTN_WIDTH = 50;
 	private int BTN_HEIGHT = 14;
 
-	private int TEXT_LEFT = 55;
-	private int TEXT_WIDTH = WIDTH - TEXT_LEFT;
-
 	public WndLangs(){
 		super();
 
@@ -92,20 +93,28 @@ public class WndLangs extends Window {
 				}
 			}
 			btn.setSize(BTN_WIDTH, BTN_HEIGHT);
-			btn.setPos(0, y);
+			if (ShatteredPixelDungeon.landscape() && i % 2 == 1){
+				btn.setPos(BTN_WIDTH+1, y-15);
+			} else {
+				btn.setPos(0, y);
+				y += 15;
+			}
+
 			add(btn);
-			y += 15;
 		}
-		y--;
-		resize(WIDTH, y);
+		y = Math.max(MIN_HEIGHT, y+1);
+		resize(ShatteredPixelDungeon.landscape() ? WIDTH_L : WIDTH_P, y);
+
+		int textLeft = width - 65;
+		int textWidth = width - textLeft;
 
 		ColorBlock separator = new ColorBlock(1, y, 0xFF000000);
-		separator.x = (BTN_WIDTH + TEXT_LEFT)/2f;
+		separator.x = textLeft - 2.5f;
 		add(separator);
 
 		//language info layout.
 		RenderedText title = PixelScene.renderText( Messages.titleCase(currLang.nativeName()) , 9 );
-		title.x = TEXT_LEFT + (TEXT_WIDTH - title.width())/2f;
+		title.x = textLeft + (textWidth - title.width())/2f;
 		title.y = 0;
 		title.hardlight(TITLE_COLOR);
 		add(title);
@@ -113,8 +122,8 @@ public class WndLangs extends Window {
 		if (currLang == Languages.ENGLISH){
 
 			RenderedTextMultiline info = PixelScene.renderMultiline(6);
-			info.text("This is the source language, written by the developer.", WIDTH - TEXT_LEFT);
-			info.setPos(TEXT_LEFT, title.height() + 2);
+			info.text("This is the source language, written by the developer.", width - textLeft);
+			info.setPos(textLeft, title.height() + 2);
 			add(info);
 
 		} else {
@@ -122,16 +131,16 @@ public class WndLangs extends Window {
 			RenderedTextMultiline info = PixelScene.renderMultiline(6);
 			switch (currLang.status()) {
 				case REVIEWED:
-					info.text(Messages.get(this, "completed"), WIDTH - TEXT_LEFT);
+					info.text(Messages.get(this, "completed"), width - textLeft);
 					break;
 				case UNREVIEWED:
-					info.text(Messages.get(this, "unreviewed"), WIDTH - TEXT_LEFT);
+					info.text(Messages.get(this, "unreviewed"), width - textLeft);
 					break;
 				case INCOMPLETE:
-					info.text(Messages.get(this, "unfinished"), WIDTH - TEXT_LEFT);
+					info.text(Messages.get(this, "unfinished"), width - textLeft);
 					break;
 			}
-			info.setPos(TEXT_LEFT, title.height() + 2);
+			info.setPos(textLeft, title.height() + 2);
 			add(info);
 
 			RedButton creditsBtn = new RedButton(Messages.titleCase(Messages.get(this, "credits"))){
@@ -178,12 +187,12 @@ public class WndLangs extends Window {
 				}
 			};
 			creditsBtn.setSize(creditsBtn.reqWidth() + 2, 16);
-			creditsBtn.setPos(TEXT_LEFT + (TEXT_WIDTH - creditsBtn.width()) / 2f, y - 18);
+			creditsBtn.setPos(textLeft + (textWidth - creditsBtn.width()) / 2f, y - 18);
 			add(creditsBtn);
 
 			RenderedTextMultiline transifex_text = PixelScene.renderMultiline(6);
-			transifex_text.text(Messages.get(this, "transifex"), WIDTH - TEXT_LEFT);
-			transifex_text.setPos(TEXT_LEFT, creditsBtn.top() - 2 - transifex_text.height());
+			transifex_text.text(Messages.get(this, "transifex"), width - textLeft);
+			transifex_text.setPos(textLeft, creditsBtn.top() - 2 - transifex_text.height());
 			add(transifex_text);
 
 		}