From 820181044f3866e408647b615c851f20435c5cb5 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 3 Jun 2020 14:19:51 +0200 Subject: [PATCH] fixed some ui issues --- TouchyTickets/GameImpl.cs | 2 +- TouchyTickets/Ui.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/TouchyTickets/GameImpl.cs b/TouchyTickets/GameImpl.cs index c8e6768..144ac4a 100644 --- a/TouchyTickets/GameImpl.cs +++ b/TouchyTickets/GameImpl.cs @@ -38,7 +38,7 @@ namespace TouchyTickets { this.Ui = new Ui(this.UiSystem); this.Camera = new Camera(this.GraphicsDevice) { - Scale = 2, + Scale = 4, AutoScaleWithScreen = true, AutoScaleReferenceSize = new Point(720, 1280), MaxScale = 24, diff --git a/TouchyTickets/Ui.cs b/TouchyTickets/Ui.cs index 45f18c2..c4d863c 100644 --- a/TouchyTickets/Ui.cs +++ b/TouchyTickets/Ui.cs @@ -333,10 +333,15 @@ namespace TouchyTickets { PopulateUpgradeList(upgradeList); } }); - button.OnUpdated += (e, time) => { + + void HideAndDisable() { button.IsHidden = upgrade.Dependencies.Any(u => !u.IsActive()); button.IsDisabled = upgrade.IsActive() || GameImpl.Instance.Stars < upgrade.Price; - }; + } + + button.OnUpdated += (e, time) => HideAndDisable(); + HideAndDisable(); + button.AddChild(new Paragraph(Anchor.TopCenter, 1, Localization.Get(upgrade.Name), true)); button.AddChild(new Image(Anchor.CenterLeft, new Vector2(0.2F, 40), upgrade.Texture) { Padding = new Vector2(4)