From 627d6ecd7870d916362de6f497303f689fe7d53c Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Fri, 29 Dec 2017 21:09:53 +0200 Subject: [PATCH] Minor UI fixes --- .../BarotraumaClient/Source/Map/WayPoint.cs | 16 ++++++++-------- .../Source/Screens/CampaignUI.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs b/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs index e86d09c21..6749e21b6 100644 --- a/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs +++ b/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs @@ -156,8 +156,8 @@ namespace Barotrauma int height = spawnType == SpawnType.Path ? 100 : 200; int x = GameMain.GraphicsWidth / 2 - width / 2, y = 10; - editingHUD = new GUIFrame(new Rectangle(x, y, width, height), Color.Black * 0.5f); - editingHUD.Padding = new Vector4(10, 10, 0, 0); + editingHUD = new GUIFrame(new Rectangle(x, y, width, height)); + editingHUD.Padding = new Vector4(10, 10, 20, 0); editingHUD.UserData = this; if (spawnType == SpawnType.Path) @@ -182,8 +182,8 @@ namespace Barotrauma y = 40 + 20; - new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("IDCardDescription"), Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD); - GUITextBox propertyBox = new GUITextBox(new Rectangle(100, y, 350, 20), "", editingHUD); + new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("IDCardDescription"), "", Alignment.TopLeft, Alignment.CenterLeft, editingHUD, false, GUI.SmallFont); + GUITextBox propertyBox = new GUITextBox(new Rectangle(150, y, 0, 20), "", editingHUD); propertyBox.MaxTextLength = 150; propertyBox.Text = idCardDesc; propertyBox.OnEnterPressed = EnterIDCardDesc; @@ -192,8 +192,8 @@ namespace Barotrauma y = y + 30; - new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("IDCardTags"), Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD); - propertyBox = new GUITextBox(new Rectangle(100, y, 350, 20), "", editingHUD); + new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("IDCardTags"), "", Alignment.TopLeft, Alignment.CenterLeft, editingHUD, false, GUI.SmallFont); + propertyBox = new GUITextBox(new Rectangle(150, y, 0, 20), "", editingHUD); propertyBox.MaxTextLength = 60; propertyBox.Text = string.Join(", ", idCardTags); propertyBox.OnEnterPressed = EnterIDCardTags; @@ -202,8 +202,8 @@ namespace Barotrauma y = y + 30; - new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("SpawnpointJobs"), Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD); - propertyBox = new GUITextBox(new Rectangle(100, y, 350, 20), "", editingHUD); + new GUITextBlock(new Rectangle(0, y, 100, 20), TextManager.Get("SpawnpointJobs"), "", Alignment.TopLeft, Alignment.CenterLeft, editingHUD, false, GUI.SmallFont); + propertyBox = new GUITextBox(new Rectangle(150, y, 0, 20), "", editingHUD); propertyBox.MaxTextLength = 60; propertyBox.Text = (assignedJob == null) ? "None" : assignedJob.Name; propertyBox.OnEnterPressed = EnterAssignedJob; diff --git a/Barotrauma/BarotraumaClient/Source/Screens/CampaignUI.cs b/Barotrauma/BarotraumaClient/Source/Screens/CampaignUI.cs index 0d468c42c..4751c8ac2 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/CampaignUI.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/CampaignUI.cs @@ -204,7 +204,7 @@ namespace Barotrauma { var mission = GameMain.GameSession.Map.SelectedConnection.Mission; - new GUITextBlock(new Rectangle(0, titleText.Rect.Height + 20, 0, 20), TextManager.Get("Mission") + ":" + mission.Name, "", locationPanel); + new GUITextBlock(new Rectangle(0, titleText.Rect.Height + 20, 0, 20), TextManager.Get("Mission") + ": " + mission.Name, "", locationPanel); new GUITextBlock(new Rectangle(0, titleText.Rect.Height + 40, 0, 20), TextManager.Get("Reward") + ": " + mission.Reward + " " + TextManager.Get("Credits"), "", locationPanel); new GUITextBlock(new Rectangle(0, titleText.Rect.Height + 70, 0, 0), mission.Description, "", Alignment.TopLeft, Alignment.TopLeft, locationPanel, true, GUI.SmallFont); }