vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed mission text overflowing in shiftsummary, netlobbyscreen button layout improvement

Browse Source
This commit is contained in:
Regalis
2016-01-20 23:20:22 +02:00
parent 06d713e2a3
commit 6f537ebc7c
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/GameSession/ShiftSummary.cs
+8 -8
View File
@@ -35,8 +35,8 @@ namespace Barotrauma
{ {
this.gameSession = gameSession; this.gameSession = gameSession;
startLocation = gameSession.Map==null ? null : gameSession.Map.CurrentLocation; startLocation = gameSession.Map==null ? null : gameSession.Map.CurrentLocation;
endLocation = gameSession.Map==null ? null : gameSession.Map.SelectedLocation; endLocation = gameSession.Map==null ? null : gameSession.Map.SelectedLocation;
selectedMission = gameSession.Mission; selectedMission = gameSession.Mission;
} }
@@ -122,15 +122,15 @@ namespace Barotrauma
new GUITextBlock(new Rectangle(0, y, 0, 20), "Mission: " + GameMain.GameSession.Mission.Name, GUI.Style, innerFrame, GUI.LargeFont); new GUITextBlock(new Rectangle(0, y, 0, 20), "Mission: " + GameMain.GameSession.Mission.Name, GUI.Style, innerFrame, GUI.LargeFont);
y += 30; y += 30;
new GUITextBlock(new Rectangle(0, y, 0, 30), new GUITextBlock(new Rectangle(0, y, innerFrame.Rect.Width - 170, 0),
(GameMain.GameSession.Mission.Completed) ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage, (GameMain.GameSession.Mission.Completed) ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage+" asdf asdf rthdrthfgdh dsrt dfgh dftsret dfth dftdthdft sdre sdr ds askjinflaje wwwwwwwwww wwwwwwww wwwwwwwwwwwwwww wwwwwwwwwww",
GUI.Style, innerFrame); GUI.Style, innerFrame, true);
y += 40; //y += 50;
if (GameMain.GameSession.Mission.Completed && singleplayer) if (GameMain.GameSession.Mission.Completed && singleplayer)
{ {
new GUITextBlock(new Rectangle(0, y, 0, 30), "Reward: " + GameMain.GameSession.Mission.Reward, GUI.Style, innerFrame); new GUITextBlock(new Rectangle(0, 0, 0, 30), "Reward: " + GameMain.GameSession.Mission.Reward, GUI.Style, Alignment.BottomLeft, Alignment.BottomLeft, innerFrame);
y += 30; //y += 30;
} }
} }
Subsurface/Source/Screens/NetLobbyScreen.cs
+3 -5
View File
@@ -299,8 +299,6 @@ namespace Barotrauma
{ {
GameMain.LightManager.LosEnabled = false; GameMain.LightManager.LosEnabled = false;
GUI.ScreenOverlayColor = Color.Transparent;
textBox.Select(); textBox.Select();
Character.Controlled = null; Character.Controlled = null;
@@ -429,15 +427,15 @@ namespace Barotrauma
GameMain.GraphicsWidth<1000 ? GUI.SmallFont : GUI.Font); GameMain.GraphicsWidth<1000 ? GUI.SmallFont : GUI.Font);
jobText.UserData = job; jobText.UserData = job;
GUIButton infoButton = new GUIButton(new Rectangle(0, 0, 15, 15), "?", GUI.Style, jobText); GUIButton infoButton = new GUIButton(new Rectangle(0, 2, 15, 15), "?", GUI.Style, jobText);
infoButton.UserData = -1; infoButton.UserData = -1;
infoButton.OnClicked += ViewJobInfo; infoButton.OnClicked += ViewJobInfo;
GUIButton upButton = new GUIButton(new Rectangle(30, 0, 15, 15), "^", GUI.Style, jobText); GUIButton upButton = new GUIButton(new Rectangle(30, 2, 15, 15), "^", GUI.Style, jobText);
upButton.UserData = -1; upButton.UserData = -1;
upButton.OnClicked += ChangeJobPreference; upButton.OnClicked += ChangeJobPreference;
GUIButton downButton = new GUIButton(new Rectangle(50, 0, 15, 15), "˅", GUI.Style, jobText); GUIButton downButton = new GUIButton(new Rectangle(50, 2, 15, 15), "˅", GUI.Style, jobText);
downButton.UserData = 1; downButton.UserData = 1;
downButton.OnClicked += ChangeJobPreference; downButton.OnClicked += ChangeJobPreference;
} }