From bcf7db0e735cb59736253a9614ccfc9756f292e6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 12 Apr 2023 14:09:45 -0400 Subject: [PATCH] v2.0.2: adjusted lang warning in changes scene, now shows in all layouts --- .../shatteredpixeldungeon/scenes/ChangesScene.java | 11 ++++++++--- .../ui/changelist/ChangeInfo.java | 3 +++ .../ui/changelist/v2_X_Changes.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 88237a765..8e2eea8bc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Chrome; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; @@ -122,9 +123,7 @@ public class ChangesScene extends PixelScene { rightScroll.content().add(changeTitle); String body = Messages.get(this, "right_body"); - if (Messages.lang() != Languages.ENGLISH){ - body += "\n\n_" + Messages.get(this, "lang_warn") + "_"; - } + changeBody = PixelScene.renderTextBlock(body, 6); changeBody.maxWidth(pw - panel.marginHor()); changeBody.setPos(0, changeTitle.bottom()+2); @@ -139,6 +138,12 @@ public class ChangesScene extends PixelScene { add( panel ); final ArrayList changeInfos = new ArrayList<>(); + + if (Messages.lang() != Languages.ENGLISH){ + ChangeInfo langWarn = new ChangeInfo("", true, Messages.get(this, "lang_warn")); + langWarn.hardlight(CharSprite.WARNING); + changeInfos.add(langWarn); + } switch (changesSelected){ case 0: default: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/ChangeInfo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/ChangeInfo.java index 470cbb23e..c75c63541 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/ChangeInfo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/ChangeInfo.java @@ -64,6 +64,9 @@ public class ChangeInfo extends Component { public void hardlight( int color ){ title.hardlight( color ); + if (text != null){ + text.hardlight(color); + } } public void addButton( ChangeButton button ){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java index 38c17c986..a694b3ef9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java @@ -76,7 +76,7 @@ public class v2_X_Changes { changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); - changes = new ChangeInfo("", false, null); + changes = new ChangeInfo("v2.0.2", false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes);