mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-22 15:29:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolve problems post-merge

Browse Source
This commit is contained in:
Adrian 2024-08-28 15:28:02 -04:00
parent 6af172f38e
commit cd25746559
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/locales/es/menu-ui-handler.json
View File

@ -24,5 +24,6 @@
"linkGoogle": "Conectar Google", "linkGoogle": "Conectar Google",
"unlinkGoogle": "Desconectar Google", "unlinkGoogle": "Desconectar Google",
"cancel": "Cancelar", "cancel": "Cancelar",
"losingProgressionWarning": "Perderás cualquier progreso desde el inicio de la batalla. ¿Continuar?" "losingProgressionWarning": "Perderás cualquier progreso desde el inicio de la batalla. ¿Continuar?",
"noEggs": "No hay huevos incubándose ahora mismo."
} }

2
src/locales/zh_CN/menu-ui-handler.json
View File

@ -25,5 +25,5 @@
"unlinkGoogle": "解除关联Google", "unlinkGoogle": "解除关联Google",
"cancel": "取消", "cancel": "取消",
"losingProgressionWarning": "你将失去自战斗开始以来的所有进度。\n是否继续？", "losingProgressionWarning": "你将失去自战斗开始以来的所有进度。\n是否继续？",
"noEggs": "当前没有任何蛋\n正在孵化中！" "noEggs": "当前没有任何蛋正在孵化中！"
} }

3
src/locales/zh_TW/menu-ui-handler.json
View File

@ -20,5 +20,6 @@
"exportData": "導出數據", "exportData": "導出數據",
"consentPreferences": "同意偏好", "consentPreferences": "同意偏好",
"cancel": "取消", "cancel": "取消",
"losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續？" "losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續？",
"noEggs": "當前沒有任何蛋正在孵化中！"
} }

5
src/ui/menu-ui-handler.ts
View File

@ -142,7 +142,7 @@ export default class MenuUiHandler extends MessageUiHandler {
const menuMessageText = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 }); const menuMessageText = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
menuMessageText.setName("menu-message"); menuMessageText.setName("menu-message");
menuMessageText.setOrigin(0, 0); menuMessageText.setOrigin(0, 0);
menuMessageText.setWordWrapWidth(menuMessageBox.getBounds().width - this.menuBg.width * 0.04); menuMessageText.setWordWrapWidth(menuMessageBox.getBounds().width * 0.95);
this.menuMessageBoxContainer.add(menuMessageText); this.menuMessageBoxContainer.add(menuMessageText);
this.message = menuMessageText; this.message = menuMessageText;
@ -173,7 +173,7 @@ export default class MenuUiHandler extends MessageUiHandler {
return true; return true;
} }
}]), }]),
xOffset: 98 xOffset: this.menuBg.width
}; };
ui.setOverlayMode(Mode.MENU_OPTION_SELECT, config); ui.setOverlayMode(Mode.MENU_OPTION_SELECT, config);
}); });
@ -534,7 +534,6 @@ export default class MenuUiHandler extends MessageUiHandler {
showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void { showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void {
this.menuMessageBoxContainer.setVisible(!!text); this.menuMessageBoxContainer.setVisible(!!text);
this.adjustText(text, this.message, this.messageBoxBg.getBounds().width, { this.adjustText(text, this.message, this.messageBoxBg.getBounds().width, {
padding: this.message.x,
ignoreTextBalance: "all" ignoreTextBalance: "all"
}); });

10
src/ui/message-ui-handler.ts
View File

@ -5,7 +5,6 @@ import * as Utils from "../utils";
import i18next from "i18next"; import i18next from "i18next";
type argsAjustText = { type argsAjustText = {
padding?:number;
ignoreTextBalance?:Array<string>|"all"; ignoreTextBalance?:Array<string>|"all";
ignoreLanguages?:Array<string>; ignoreLanguages?:Array<string>;
}; };
@ -236,18 +235,15 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
textObject.setWordWrapWidth(maxWidth * 0.65); textObject.setWordWrapWidth(maxWidth * 0.65);
} }
// If is very near to border add "padding", not need if border container appareance is nice
const padding = opts.padding ?? 0;
// Text ajust // Text ajust
if (textWrapped().length > textObject.style.maxLines || (textSize().width + padding) > maxWidth) { if (textWrapped().length > textObject.style.maxLines || (textSize().width + textObject.x) > maxWidth) {
let fontDecrement = fontSize; let fontDecrement = fontSize;
while (textWrapped().length > textObject.style.maxLines || (textSize().width + padding) > maxWidth) { while (textWrapped().length > textObject.style.maxLines || (textSize().width + textObject.x) > maxWidth) {
fontDecrement -= 1; fontDecrement -= 1;
textObject.setFontSize(fontDecrement); textObject.setFontSize(fontDecrement);
} }
textObject.setFontSize(fontDecrement - padding / 2); textObject.setFontSize(fontDecrement - textObject.x / 2);
} }
} }