jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: app menu vertical align

Browse Source
This commit is contained in:
Jisang Park
2018-06-21 11:48:22 +09:00
parent 454f42eb74
commit 225c6e944e
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/menu/menu_typing_practice.js
+13 -10
View File
@@ -35,14 +35,14 @@ class MenuTypingPractice {
let dbConnectManager = new DBConnectManager(); let dbConnectManager = new DBConnectManager();
dbConnectManager.requestTypingPracticeAppList( dbConnectManager.requestTypingPracticeAppList(
sessionStorageManager.maestroID, sessionStorageManager.maestroID,
self.loginSucceeded, self.downloadListSucceeded,
self.loginFailed self.downloadListFailed
); );
} }
loginSucceeded(replyJSON) { downloadListSucceeded(replyJSON) {
// console.log(replyJSON); console.log(replyJSON);
let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP; let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
@@ -116,22 +116,25 @@ class MenuTypingPractice {
} }
getButtonPosY(index, buttonCount, startPosY) { getButtonPosY(index, buttonCount, startPosY) {
let gap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP; let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / 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("maxColumnNum : " + maxColumnNum);
// console.log("buttonCount : " + buttonCount);
let rowCount = Math.ceil(buttonCount / maxColumnNum); let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount); // console.log("rowCount : " + rowCount);
let rowIndex = Math.floor(index / maxColumnNum); let rowIndex = Math.floor(index / maxColumnNum);
// console.log("rowIndex : " + rowIndex); // console.log("rowIndex : " + rowIndex);
let startY = startPosY - ( (gap / 2) * (rowCount - 1) ); let startY = startPosY - ( (rowGap / 2) * (rowCount - 1) );
return startY + gap * rowIndex; return startY + rowGap * rowIndex;
} }
loginFailed(replyJSON) { downloadListFailed(replyJSON) {
console.log('login failed, jsonData : ' + JSON.stringify(replyJSON)); console.log('download app list failed, jsonData : ' + JSON.stringify(replyJSON));
} }
} }
src/game/menu/menu_typing_test.js
+12 -9
View File
@@ -35,13 +35,13 @@ class MenuTypingTest {
let dbConnectManager = new DBConnectManager(); let dbConnectManager = new DBConnectManager();
dbConnectManager.requestTypingTestAppList( dbConnectManager.requestTypingTestAppList(
sessionStorageManager.maestroID, sessionStorageManager.maestroID,
self.loginSucceeded, self.downloadListSucceeded,
self.loginFailed self.downloadListFailed
); );
} }
loginSucceeded(replyJSON) { downloadListSucceeded(replyJSON) {
// console.log(replyJSON); // console.log(replyJSON);
let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingTest.BUTTON_GAP; let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingTest.BUTTON_GAP;
@@ -119,22 +119,25 @@ class MenuTypingTest {
} }
getButtonPosY(index, buttonCount, startPosY) { getButtonPosY(index, buttonCount, startPosY) {
let gap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP; let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / 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("maxColumnNum : " + maxColumnNum);
// console.log("buttonCount : " + buttonCount);
let rowCount = Math.ceil(buttonCount / maxColumnNum); let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount); // console.log("rowCount : " + rowCount);
let rowIndex = Math.floor(index / maxColumnNum); let rowIndex = Math.floor(index / maxColumnNum);
// console.log("rowIndex : " + rowIndex); // console.log("rowIndex : " + rowIndex);
let startY = startPosY - ( (gap / 2) * (rowCount - 1) ); let startY = startPosY - ( (rowGap / 2) * (rowCount - 1) );
return startY + gap * rowIndex; return startY + rowGap * rowIndex;
} }
loginFailed(replyJSON) { downloadListFailed(replyJSON) {
console.log('login failed, jsonData : ' + JSON.stringify(replyJSON)); console.log('download app list failed, jsonData : ' + JSON.stringify(replyJSON));
} }
} }