"Suicide button" is also usable in single player, unconscious characters can't be selected in sp, fixed resizing textblocks with wrapped text

2016-04-23 17:26:56 +03:00
parent 99072592bc
commit 14ef736176
7 changed files with 32 additions and 23 deletions
@@ -230,8 +230,8 @@ namespace Barotrauma
            }

            scrollBar.BarSize = scrollBar.IsHorizontal ?
-                Math.Min((float)rect.Width / (float)totalSize, 1.0f) :
-                Math.Min((float)rect.Height / (float)totalSize, 1.0f);
+                Math.Max(Math.Min((float)rect.Width / (float)totalSize, 1.0f), 5.0f / rect.Width) :
+                Math.Max(Math.Min((float)rect.Height / (float)totalSize, 1.0f), 5.0f / rect.Height);

            if (scrollBar.BarSize < 1.0f && scrollBarHidden) ShowScrollBar();
            if (scrollBar.BarSize >= 1.0f && !scrollBarHidden) HideScrollBar();