space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't draw text contents over scrollbar for outputpanel (#3876)"

Browse Source 
This reverts commit 7b60f5bd06.
This commit is contained in:
Kara
2023-04-02 22:27:10 -07:00
committed by GitHub
parent 07192c4294
commit 0b6cd3eccf
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Robust.Client/UserInterface/Controls/OutputPanel.cs
View File

@@ -29,11 +29,6 @@ namespace Robust.Client.UserInterface.Controls
public bool ScrollFollowing { get; set; } = true;
/// <summary>
/// Margin between the text and the scrollbar.
/// </summary>
public float ScrollMargin = 4f;
public OutputPanel()
{
IoCManager.InjectDependencies(this);
@@ -43,7 +38,7 @@ namespace Robust.Client.UserInterface.Controls
_scrollBar = new VScrollBar
{
Name = "_v_scroll",
HorizontalAlignment = HAlignment.Right,
HorizontalAlignment = HAlignment.Right
};
AddChild(_scrollBar);
_scrollBar.OnValueChanged += _ => _isAtBottom = _scrollBar.IsAtEnd;
@@ -235,8 +230,7 @@ namespace Robust.Client.UserInterface.Controls
private UIBox2 _getContentBox()
{
var style = _getStyleBox();
var box = style?.GetContentBox(PixelSizeBox) ?? PixelSizeBox;
return new UIBox2(box.Left, box.Top, box.Right - _scrollBar.SizeBox.Width - Margin.Right - ScrollMargin, box.Bottom);
return style?.GetContentBox(PixelSizeBox) ?? PixelSizeBox;
}
protected internal override void UIScaleChanged()