From 225c6e944e629d7e7c508dfd9bf730018e2d7478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Thu, 21 Jun 2018 11:48:22 +0900
Subject: [PATCH] Fix: app menu vertical align

---
 src/game/menu/menu_typing_practice.js | 23 +++++++++++++----------
 src/game/menu/menu_typing_test.js     | 21 ++++++++++++---------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/game/menu/menu_typing_practice.js b/src/game/menu/menu_typing_practice.js
index c160012..b99ff7b 100644
--- a/src/game/menu/menu_typing_practice.js
+++ b/src/game/menu/menu_typing_practice.js
@@ -35,14 +35,14 @@ class MenuTypingPractice {
 		let dbConnectManager = new DBConnectManager();
 		dbConnectManager.requestTypingPracticeAppList(
 			sessionStorageManager.maestroID,
-			self.loginSucceeded,
-			self.loginFailed
+			self.downloadListSucceeded,
+			self.downloadListFailed
 		);
 
 	}
 
-	loginSucceeded(replyJSON) {
-		// console.log(replyJSON);
+	downloadListSucceeded(replyJSON) {
+		console.log(replyJSON);
 
 		let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
 
@@ -116,22 +116,25 @@ class MenuTypingPractice {
 	}
 
 	getButtonPosY(index, buttonCount, startPosY) {
-		let gap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
-		let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
+		let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
+
+		let columnGap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
+		let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / columnGap );
 		// console.log("maxColumnNum : " + maxColumnNum);
+		// console.log("buttonCount : " + buttonCount);
 		let rowCount = Math.ceil(buttonCount / maxColumnNum);
 		// console.log("rowCount : " + rowCount);
 
 		let rowIndex = Math.floor(index / maxColumnNum);
 		// console.log("rowIndex : " + rowIndex);
 
-		let startY = startPosY - ( (gap / 2) * (rowCount - 1) );
-		return startY + gap * rowIndex;
+		let startY = startPosY - ( (rowGap / 2) * (rowCount - 1) );
+		return startY + rowGap * rowIndex;
 	}
 
 
-	loginFailed(replyJSON) {
-		console.log('login failed, jsonData : ' + JSON.stringify(replyJSON));
+	downloadListFailed(replyJSON) {
+		console.log('download app list failed, jsonData : ' + JSON.stringify(replyJSON));
 	}
 
 }
\ No newline at end of file
diff --git a/src/game/menu/menu_typing_test.js b/src/game/menu/menu_typing_test.js
index 44fb32f..aca4d89 100644
--- a/src/game/menu/menu_typing_test.js
+++ b/src/game/menu/menu_typing_test.js
@@ -35,13 +35,13 @@ class MenuTypingTest {
 		let dbConnectManager = new DBConnectManager();
 		dbConnectManager.requestTypingTestAppList(
 			sessionStorageManager.maestroID,
-			self.loginSucceeded,
-			self.loginFailed
+			self.downloadListSucceeded,
+			self.downloadListFailed
 		);
 
 	}
 
-	loginSucceeded(replyJSON) {
+	downloadListSucceeded(replyJSON) {
 		// console.log(replyJSON);
 
 		let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingTest.BUTTON_GAP;
@@ -119,22 +119,25 @@ class MenuTypingTest {
 	}
 
 	getButtonPosY(index, buttonCount, startPosY) {
-		let gap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
-		let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
+		let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
+
+		let columnGap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
+		let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / columnGap );
 		// console.log("maxColumnNum : " + maxColumnNum);
+		// console.log("buttonCount : " + buttonCount);
 		let rowCount = Math.ceil(buttonCount / maxColumnNum);
 		// console.log("rowCount : " + rowCount);
 
 		let rowIndex = Math.floor(index / maxColumnNum);
 		// console.log("rowIndex : " + rowIndex);
 
-		let startY = startPosY - ( (gap / 2) * (rowCount - 1) );
-		return startY + gap * rowIndex;
+		let startY = startPosY - ( (rowGap / 2) * (rowCount - 1) );
+		return startY + rowGap * rowIndex;
 	}
 
 
-	loginFailed(replyJSON) {
-		console.log('login failed, jsonData : ' + JSON.stringify(replyJSON));
+	downloadListFailed(replyJSON) {
+		console.log('download app list failed, jsonData : ' + JSON.stringify(replyJSON));
 	}
 
 }
\ No newline at end of file