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

(6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-04 16:03:00 +03:00
parent aaa945ded8
commit 8184f0e6f6
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GameSettings.cs
+9
View File
@@ -239,6 +239,15 @@ namespace Barotrauma
{ {
displayModeDD.SelectItem(GameMain.Config.WindowMode); displayModeDD.SelectItem(GameMain.Config.WindowMode);
} }
#endif
displayModeDD.OnSelected = (guiComponent, obj) =>
{
displayModeDD.SelectItem(WindowMode.Fullscreen);
}
else
{
displayModeDD.SelectItem(GameMain.Config.WindowMode);
}
#endif #endif
displayModeDD.OnSelected = (guiComponent, obj) => displayModeDD.OnSelected = (guiComponent, obj) =>
{ {
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+4 -4
View File
@@ -51,7 +51,7 @@ namespace Barotrauma
{ {
itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "", itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "",
textColor: Color.Orange, color: Color.Black, textColor: Color.Orange, color: Color.Black,
textAlignment:Alignment.Center, style: "OuterGlow"); textAlignment: Alignment.Center, style: "OuterGlow");
} }
return itemInUseWarning; return itemInUseWarning;
} }
@@ -662,7 +662,7 @@ namespace Barotrauma
new Rectangle( new Rectangle(
20, 20, 20, 20,
GameMain.GraphicsWidth - 40, GameMain.GraphicsWidth - 40,
HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 20 : GameMain.GraphicsHeight - 80)); HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 40 : GameMain.GraphicsHeight - 80));
foreach (ItemComponent ic in activeHUDs) foreach (ItemComponent ic in activeHUDs)
{ {
@@ -740,9 +740,9 @@ namespace Barotrauma
} }
} }
if (itemInUseWarning != null && mergedHUDRect != Rectangle.Empty) if (mergedHUDRect != Rectangle.Empty)
{ {
itemInUseWarning.Visible = false; if (itemInUseWarning != null) { itemInUseWarning.Visible = false; }
foreach (Character otherCharacter in Character.CharacterList) foreach (Character otherCharacter in Character.CharacterList)
{ {
if (otherCharacter != character && if (otherCharacter != character &&
Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
-16
View File
@@ -217,22 +217,6 @@ namespace Barotrauma
return true; return true;
} }
private bool RefreshJoinButtonState(GUIComponent component, object obj)
{
if (obj == null || waitingForRefresh) { return false; }
if (!string.IsNullOrWhiteSpace(clientNameBox.Text) && !string.IsNullOrWhiteSpace(ipBox.Text))
{
joinButton.Enabled = true;
}
else
{
joinButton.Enabled = false;
}
return true;
}
private bool SelectServer(GUIComponent component, object obj) private bool SelectServer(GUIComponent component, object obj)
{ {
if (obj == null || waitingForRefresh || (!(obj is ServerInfo))) { return false; } if (obj == null || waitingForRefresh || (!(obj is ServerInfo))) { return false; }