From 0b387fdde441d68f4c9f175128f8597feda80449 Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 7 Oct 2024 13:59:12 -0400 Subject: [PATCH] helpEmojiListBg auto adjust --- src/ui/rename-form-ui-handler.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/rename-form-ui-handler.ts index 120eb301c06..a61a144097c 100644 --- a/src/ui/rename-form-ui-handler.ts +++ b/src/ui/rename-form-ui-handler.ts @@ -5,9 +5,8 @@ import { PlayerPokemon } from "#app/field/pokemon"; import { Mode } from "./ui"; import { OptionSelectItem } from "./abstact-option-select-ui-handler"; import { addWindow } from "./ui-theme"; -import { addTextObject, getTextStyleOptions, TextStyle } from "./text"; +import { addTextObject, TextStyle } from "./text"; import InputText from "phaser3-rex-plugins/plugins/inputtext"; -import BattleScene from "#app/battle-scene"; import { OptionSelectConfigAC } from "./autocomplete-ui-handler"; import emojisAvailable from "#app/data/emoji"; import { emojiRegex } from "#app/data/emoji"; @@ -77,15 +76,14 @@ export default class RenameFormUiHandler extends FormModalUiHandler { const helpEmojiListContainer = this.scene.add.container(0, this.getHeight()); const helpEmojiListBg = addWindow(this.scene, 0, 0, this.getWidth(), 52); helpEmojiListContainer.add(helpEmojiListBg); - const scale = getTextStyleOptions(TextStyle.WINDOW, (this.scene as BattleScene).uiTheme).scale ?? 0.1666666667; - const helpEmojiListText = addTextObject(this.scene, 8, 4, i18next.t("menu:renameHelpEmoji"), TextStyle.TOOLTIP_CONTENT, { + const helpEmojiListText = addTextObject(this.scene, 8, 6, i18next.t("menu:renameHelpEmoji"), TextStyle.TOOLTIP_CONTENT, { fontSize: "80px", }); helpEmojiListText.setWordWrapWidth(890); if (this.scene.game.renderer.type === Phaser.WEBGL) { // TODO: this bang is correct? With this the tests do not fail - const height = ((Math.min((helpEmojiListText.getWrappedText(helpEmojiListText.text)).length, 99)) * (80 + helpEmojiListText.y) * scale) + helpEmojiListText.y; - helpEmojiListBg.setSize(helpEmojiListBg.width, height); + const textSize = Phaser.GameObjects.GetTextSize(helpEmojiListText, helpEmojiListText.style.getTextMetrics(), helpEmojiListText.getWrappedText(helpEmojiListText.text)); + helpEmojiListBg.setSize(helpEmojiListBg.width, textSize.height * helpEmojiListText.scale + (helpEmojiListText.y * 2) + 1); } helpEmojiListContainer.add(helpEmojiListText);