epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement ScrollableLineGraphWidget.

Browse Source
This commit is contained in:
darkademic
2025-07-15 17:35:35 +01:00
committed by Gustas Kažukauskas
parent 3a5358ad7c
commit 77baa7a35f
7 changed files with 441 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -83,8 +83,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollItemWidget combatPlayerTemplate;
readonly ContainerWidget incomeGraphContainer;
readonly ContainerWidget armyValueGraphContainer;
readonly LineGraphWidget incomeGraph;
readonly LineGraphWidget armyValueGraph;
readonly ScrollableLineGraphWidget incomeGraph;
readonly ScrollableLineGraphWidget armyValueGraph;
readonly ScrollItemWidget teamTemplate;
readonly Player[] players;
readonly IGrouping<int, Player>[] teams;
@@ -145,10 +145,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
combatPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("COMBAT_PLAYER_TEMPLATE");
incomeGraphContainer = widget.Get<ContainerWidget>("INCOME_GRAPH_CONTAINER");
incomeGraph = incomeGraphContainer.Get<LineGraphWidget>("INCOME_GRAPH");
incomeGraph = incomeGraphContainer.Get<ScrollableLineGraphWidget>("INCOME_GRAPH");
armyValueGraphContainer = widget.Get<ContainerWidget>("ARMY_VALUE_GRAPH_CONTAINER");
armyValueGraph = armyValueGraphContainer.Get<LineGraphWidget>("ARMY_VALUE_GRAPH");
armyValueGraph = armyValueGraphContainer.Get<ScrollableLineGraphWidget>("ARMY_VALUE_GRAPH");
teamTemplate = playerStatsPanel.Get<ScrollItemWidget>("TEAM_TEMPLATE");
@@ -258,7 +258,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
incomeGraphContainer.Visible = true;
incomeGraph.GetSeries = () =>
players.Select(p => new LineGraphSeries(
players.Select(p => new ScrollableLineGraphSeries(
p.ResolvedPlayerName,
p.Color,
(p.PlayerActor.TraitOrDefault<PlayerStatistics>() ?? new PlayerStatistics(p.PlayerActor)).IncomeSamples.Select(s => (float)s)));
@@ -270,7 +270,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
armyValueGraphContainer.Visible = true;
armyValueGraph.GetSeries = () =>
players.Select(p => new LineGraphSeries(
players.Select(p => new ScrollableLineGraphSeries(
p.ResolvedPlayerName,
p.Color,
(p.PlayerActor.TraitOrDefault<PlayerStatistics>() ?? new PlayerStatistics(p.PlayerActor)).ArmySamples.Select(s => (float)s)));

446
OpenRA.Mods.Common/Widgets/ScrollableLineGraphWidget.cs
View File

@@ -12,6 +12,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Primitives;
using OpenRA.Widgets;
@@ -19,7 +20,8 @@ namespace OpenRA.Mods.Common.Widgets
{
public class ScrollableLineGraphWidget : Widget
{
public Func<IEnumerable<LineGraphSeries>> GetSeries;
protected readonly Ruleset ModRules;
public Func<IEnumerable<ScrollableLineGraphSeries>> GetSeries;
public Func<string> GetValueFormat;
public Func<string> GetXAxisValueFormat;
public Func<string> GetYAxisValueFormat;
@@ -43,10 +45,44 @@ namespace OpenRA.Mods.Common.Widgets
public string AxisFont;
public Color BackgroundColorDark = ChromeMetrics.Get<Color>("TextContrastColorDark");
public Color BackgroundColorLight = ChromeMetrics.Get<Color>("TextContrastColorLight");
public string ClickSound = ChromeMetrics.Get<string>("ClickSound");
public string ClickDisabledSound = ChromeMetrics.Get<string>("ClickDisabledSound");
public int Padding = 5;
public ScrollableLineGraphWidget()
// Horizontal scrolling properties
public int ScrollbarHeight = 16;
public string ScrollbarBackground = "scrollpanel-bg";
public string ScrollbarButton = "scrollpanel-button";
public string ScrollbarDecorations = "scrollpanel-decorations";
public readonly string DecorationScrollLeft = "left";
public readonly string DecorationScrollRight = "right";
public int MinimumThumbWidth = 20;
public float SmoothScrollSpeed = 0.333f;
readonly CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite> getLeftArrowImage;
readonly CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite> getRightArrowImage;
// Scroll state
float horizontalOffset = 0;
float targetHorizontalOffset = 0;
bool leftPressed = false;
bool rightPressed = false;
bool thumbPressed = false;
bool leftDisabled = false;
bool rightDisabled = false;
bool autoScrollEnabled = true;
bool manuallyScrolled = true;
int2 lastMousePos;
Rectangle leftButtonRect;
Rectangle rightButtonRect;
Rectangle scrollbarRect;
Rectangle thumbRect;
long lastSmoothScrollTime = 0;
[ObjectCreator.UseCtor]
public ScrollableLineGraphWidget(ModData modData)
{
ModRules = modData.DefaultRules;
GetValueFormat = () => ValueFormat;
GetXAxisValueFormat = () => XAxisValueFormat;
GetYAxisValueFormat = () => YAxisValueFormat;
@@ -57,11 +93,15 @@ namespace OpenRA.Mods.Common.Widgets
GetDisplayFirstYAxisValue = () => DisplayFirstYAxisValue;
GetLabelFont = () => LabelFont;
GetAxisFont = () => AxisFont;
getLeftArrowImage = WidgetUtils.GetCachedStatefulImage(ScrollbarDecorations, DecorationScrollLeft);
getRightArrowImage = WidgetUtils.GetCachedStatefulImage(ScrollbarDecorations, DecorationScrollRight);
}
protected ScrollableLineGraphWidget(ScrollableLineGraphWidget other)
: base(other)
{
ModRules = other.ModRules;
GetSeries = other.GetSeries;
GetValueFormat = other.GetValueFormat;
GetXAxisValueFormat = other.GetXAxisValueFormat;
@@ -87,6 +127,59 @@ namespace OpenRA.Mods.Common.Widgets
BackgroundColorDark = other.BackgroundColorDark;
BackgroundColorLight = other.BackgroundColorLight;
Padding = other.Padding;
ScrollbarHeight = other.ScrollbarHeight;
ScrollbarBackground = other.ScrollbarBackground;
ScrollbarButton = other.ScrollbarButton;
ScrollbarDecorations = other.ScrollbarDecorations;
DecorationScrollLeft = other.DecorationScrollLeft;
DecorationScrollRight = other.DecorationScrollRight;
MinimumThumbWidth = other.MinimumThumbWidth;
SmoothScrollSpeed = other.SmoothScrollSpeed;
getLeftArrowImage = WidgetUtils.GetCachedStatefulImage(ScrollbarDecorations, DecorationScrollLeft);
getRightArrowImage = WidgetUtils.GetCachedStatefulImage(ScrollbarDecorations, DecorationScrollRight);
}
void SetHorizontalOffset(float value, bool smooth)
{
targetHorizontalOffset = value;
if (!smooth)
{
horizontalOffset = value;
Ui.ResetTooltips();
}
}
void UpdateSmoothScrolling()
{
if (lastSmoothScrollTime == 0)
{
lastSmoothScrollTime = Game.RunTime;
return;
}
var dt = Game.RunTime - lastSmoothScrollTime;
lastSmoothScrollTime = Game.RunTime;
var offsetDiff = targetHorizontalOffset - horizontalOffset;
var absOffsetDiff = Math.Abs(offsetDiff);
if (absOffsetDiff > 1f)
{
var speed = Math.Max(0.01f, Math.Min(1f, SmoothScrollSpeed * dt / 40f));
horizontalOffset += offsetDiff * speed;
}
else
{
horizontalOffset = targetHorizontalOffset;
}
}
void Scroll(float amount, bool smooth = true)
{
var newTarget = targetHorizontalOffset + amount * Game.Settings.Game.UIScrollSpeed;
SetHorizontalOffset(newTarget, smooth);
autoScrollEnabled = false;
manuallyScrolled = true;
}
public override void Draw()
@@ -102,6 +195,8 @@ namespace OpenRA.Mods.Common.Widgets
if (font == null)
return;
UpdateSmoothScrolling();
var cr = Game.Renderer.RgbaColorRenderer;
var rect = RenderBounds;
@@ -116,31 +211,38 @@ namespace OpenRA.Mods.Common.Widgets
var xAxisPointLabelHeight = labelFont.Measure("0").Y;
var graphBottomOffset = Padding * 2 + xAxisLabelSize.Y + xAxisPointLabelHeight;
var height = rect.Height - (graphBottomOffset + Padding);
var graphBottomOffset = Padding * 2 + xAxisLabelSize.Y + xAxisPointLabelHeight + ScrollbarHeight;
var height = rect.Height - (graphBottomOffset + Padding * 4);
var maxValue = series.Select(p => p.Points).SelectMany(d => d).Concat([0f]).Max();
var longestName = series.Select(s => s.Key).OrderByDescending(s => s.Length).FirstOrDefault() ?? "";
var scale = 200 / Math.Max(5000, (float)Math.Ceiling(maxValue / 1000) * 1000);
var scaledMaxValue = Math.Max((float)Math.Ceiling(maxValue / 1000) * 1000, 5000f);
var scale = height / scaledMaxValue;
var widthMaxValue = labelFont.Measure(GetYAxisValueFormat().FormatCurrent(height / scale)).X;
var widthMaxValue = labelFont.Measure(GetYAxisValueFormat().FormatCurrent(scaledMaxValue)).X;
var widthLongestName = labelFont.Measure(longestName).X;
// y axis label
var yAxisLabel = GetYAxisLabel();
var yAxisLabelSize = axisFont.Measure(yAxisLabel);
var width = rect.Width - (Padding * 4 + widthMaxValue + widthLongestName + yAxisLabelSize.Y);
var width = rect.Width - (Padding * 10 + widthMaxValue + widthLongestName + yAxisLabelSize.Y);
var pointCount = series.Max(s => s.Points.Count());
var totalDataWidth = pointCount * (width / xAxisSize);
var maxHorizontalOffset = Math.Max(0, totalDataWidth - width);
targetHorizontalOffset = Math.Max(-maxHorizontalOffset, Math.Min(0, targetHorizontalOffset));
horizontalOffset = Math.Max(-maxHorizontalOffset, Math.Min(0, horizontalOffset));
var xStep = width / xAxisSize;
var yStep = height / yAxisSize;
var pointCount = series.Max(s => s.Points.Count());
var pointStart = Math.Max(0, pointCount - xAxisSize);
var pointEnd = Math.Max(pointCount, xAxisSize);
var visibleStart = Math.Max(0, (int)Math.Floor(-horizontalOffset / xStep));
var visibleEnd = Math.Min(pointCount, visibleStart + xAxisSize + 1);
var graphOrigin = new float2(rect.Left, rect.Bottom) + new float2(Padding * 2 + widthMaxValue + yAxisLabelSize.Y, -graphBottomOffset);
var graphOrigin = new float2(rect.Left, rect.Bottom) + new float2(Padding * 3 + widthMaxValue + yAxisLabelSize.Y, -graphBottomOffset);
var origin = new float2(rect.Left, rect.Bottom);
@@ -149,27 +251,71 @@ namespace OpenRA.Mods.Common.Widgets
// added sorting so that names appear in order of highest value to lowest value
series = series.OrderByDescending(s => s.Points.LastOrDefault()).ToList();
// Enable clipping to prevent graph lines from bleeding into Y axis labels and extending beyond bounds
// Clip both left and right sides to contain the graph within proper bounds
var graphClipRect = new Rectangle((int)graphOrigin.X, (int)(graphOrigin.Y - height), width, height);
Game.Renderer.EnableScissor(graphClipRect);
foreach (var s in series)
{
var key = s.Key;
var color = s.Color;
var points = s.Points;
if (points.Any())
var points = s.Points.ToArray();
if (points.Length > 0)
{
points = points.Reverse().Take(xAxisSize).Reverse();
var lastX = 0;
var lastPoint = 0f;
cr.DrawLine(
points.Select((point, x) =>
{
lastX = x;
lastPoint = point;
return graphOrigin + new float3(x * xStep, -point * scale, 0);
}), 1, color);
var visiblePoints = new List<float3>();
for (var i = visibleStart; i < Math.Min(visibleEnd, points.Length); i++)
{
var screenX = i * xStep + horizontalOffset;
var screenY = -points[i] * scale;
visiblePoints.Add(graphOrigin + new float3(screenX, screenY, 0));
}
if (lastPoint != 0f)
labelFont.DrawTextWithShadow(GetValueFormat().FormatCurrent(lastPoint), graphOrigin + new float2(lastX * xStep, -lastPoint * scale - 2),
color, BackgroundColorDark, BackgroundColorLight, 1);
if (visiblePoints.Count > 1)
{
cr.DrawLine(visiblePoints, 1, color);
}
}
}
// Disable clipping before drawing labels and other elements
Game.Renderer.DisableScissor();
foreach (var s in series)
{
var key = s.Key;
var color = s.Color;
var points = s.Points.ToArray();
if (points.Length > 0)
{
var visiblePoints = new List<float3>();
for (var i = visibleStart; i < Math.Min(visibleEnd, points.Length); i++)
{
var screenX = i * xStep + horizontalOffset;
var screenY = -points[i] * scale;
if (screenX >= -xStep && screenX <= width + xStep)
{
visiblePoints.Add(graphOrigin + new float3(screenX, screenY, 0));
}
}
if (visiblePoints.Count > 0)
{
var lastPoint = visiblePoints[^1];
if (lastPoint.X >= graphOrigin.X && lastPoint.X <= graphOrigin.X + width)
{
var lastIndex = visibleStart + visiblePoints.Count - 1;
var lastValue = points[Math.Min(lastIndex, points.Length - 1)];
if (lastValue != 0f)
{
labelFont.DrawTextWithShadow(GetValueFormat().FormatCurrent(lastValue),
new float2(lastPoint.X, lastPoint.Y - 2),
color, BackgroundColorDark, BackgroundColorLight, 1);
}
}
}
}
labelFont.DrawTextWithShadow(key, new float2(rect.Right, rect.Top) + new float2(-(widthLongestName + Padding), 10 * keyOffset + 3),
@@ -177,26 +323,108 @@ namespace OpenRA.Mods.Common.Widgets
keyOffset++;
}
var scrollbarY = rect.Bottom - ScrollbarHeight;
var scrollbarWidth = width;
var scrollbarX = graphOrigin.X;
scrollbarRect = new Rectangle((int)scrollbarX, scrollbarY, scrollbarWidth, ScrollbarHeight);
leftButtonRect = new Rectangle((int)scrollbarX, scrollbarY, ScrollbarHeight, ScrollbarHeight);
rightButtonRect = new Rectangle((int)(scrollbarX + scrollbarWidth - ScrollbarHeight), scrollbarY, ScrollbarHeight, ScrollbarHeight);
WidgetUtils.DrawPanel(ScrollbarBackground, scrollbarRect);
var availableThumbSpace = scrollbarWidth - 2 * ScrollbarHeight;
var thumbWidth = maxHorizontalOffset > 0 ?
Math.Max(MinimumThumbWidth, Math.Min(availableThumbSpace - MinimumThumbWidth * 2, availableThumbSpace * width / totalDataWidth)) :
availableThumbSpace;
var actualthumbWidth = Math.Min(thumbWidth, availableThumbSpace);
var thumbCalculationOffset = autoScrollEnabled && maxHorizontalOffset > 0 ? -maxHorizontalOffset : horizontalOffset;
var thumbPosition = maxHorizontalOffset > 0 ?
ScrollbarHeight + (int)((availableThumbSpace - actualthumbWidth) * (-thumbCalculationOffset / maxHorizontalOffset)) :
ScrollbarHeight;
thumbRect = new Rectangle((int)scrollbarX + thumbPosition, scrollbarY, actualthumbWidth, ScrollbarHeight);
var mouseButtonDown = leftPressed || thumbPressed || (rightPressed && !rightDisabled);
if (autoScrollEnabled && maxHorizontalOffset > 0 && !mouseButtonDown)
{
SetHorizontalOffset(-maxHorizontalOffset, false);
}
if (!autoScrollEnabled && maxHorizontalOffset > 0 && !mouseButtonDown && rightDisabled && manuallyScrolled)
{
if (rightPressed || Math.Abs(targetHorizontalOffset + maxHorizontalOffset) < 1)
{
autoScrollEnabled = true;
manuallyScrolled = false;
}
}
// Draw scrollbar elements
// When auto-scrolling is enabled, force the scrollbar to move to the rightmost position
var effectiveHorizontalOffset = autoScrollEnabled && maxHorizontalOffset > 0 ? -maxHorizontalOffset : horizontalOffset;
leftDisabled = effectiveHorizontalOffset >= 0;
rightDisabled = effectiveHorizontalOffset <= -maxHorizontalOffset;
var leftHover = Ui.MouseOverWidget == this && leftButtonRect.Contains(Viewport.LastMousePos);
var rightHover = Ui.MouseOverWidget == this && rightButtonRect.Contains(Viewport.LastMousePos);
var thumbHover = Ui.MouseOverWidget == this && thumbRect.Contains(Viewport.LastMousePos);
ButtonWidget.DrawBackground(ScrollbarButton, leftButtonRect, leftDisabled, leftPressed, leftHover, false);
ButtonWidget.DrawBackground(ScrollbarButton, rightButtonRect, rightDisabled, rightPressed, rightHover, false);
if (maxHorizontalOffset > 0)
ButtonWidget.DrawBackground(ScrollbarButton, thumbRect, false, thumbPressed, thumbHover, false);
// Draw arrow decorations
var leftOffset = !leftPressed || leftDisabled ? 0 : 1; // Using 1 instead of ButtonDepth for simplicity
var rightOffset = !rightPressed || rightDisabled ? 0 : 1;
var leftArrowImage = getLeftArrowImage.Update((leftDisabled, leftPressed, leftHover, false, false));
WidgetUtils.DrawSprite(leftArrowImage,
new float2(leftButtonRect.Left + leftOffset, leftButtonRect.Top + leftOffset));
var rightArrowImage = getRightArrowImage.Update((rightDisabled, rightPressed, rightHover, false, false));
WidgetUtils.DrawSprite(rightArrowImage,
new float2(rightButtonRect.Left + rightOffset, rightButtonRect.Top + rightOffset));
// Draw x axis
axisFont.DrawTextWithShadow(xAxisLabel,
new float2(graphOrigin.X, origin.Y) + new float2(width / 2 - xAxisLabelSize.X / 2, -(xAxisLabelSize.Y + Padding)),
new float2(graphOrigin.X, origin.Y) + new float2(width / 2 - xAxisLabelSize.X / 2, -(xAxisLabelSize.Y + Padding + ScrollbarHeight)),
Color.White, BackgroundColorDark, BackgroundColorLight, 1);
// TODO: make this stuff not draw outside of the RenderBounds
for (int n = pointStart, x = 0; n <= pointEnd; n++, x += xStep)
{
cr.DrawLine(graphOrigin + new float2(x, 0), graphOrigin + new float2(x, -5), 1, Color.White);
if (n % XAxisTicksPerLabel != 0)
continue;
// Enable clipping for x-axis labels to prevent them from extending beyond the right graph bound
var xAxisClipRect = new Rectangle((int)graphOrigin.X - 100, (int)(graphOrigin.Y - height), width + 100, height + xAxisPointLabelHeight + 10);
Game.Renderer.EnableScissor(xAxisClipRect);
var xAxisText = GetXAxisValueFormat().FormatCurrent(n / XAxisTicksPerLabel);
var xAxisTickTextWidth = labelFont.Measure(xAxisText).X;
var xLocation = x - xAxisTickTextWidth / 2;
labelFont.DrawTextWithShadow(xAxisText,
graphOrigin + new float2(xLocation, 2),
Color.White, BackgroundColorDark, BackgroundColorLight, 1);
// Draw x axis ticks and labels
var maxDataPoints = pointCount;
var labelsToShow = Math.Max(xAxisSize + 2, maxDataPoints);
for (var i = 0; i < labelsToShow; i++)
{
var screenX = i * xStep + horizontalOffset;
if (screenX >= 0)
{
cr.DrawLine(graphOrigin + new float2(screenX, 0), graphOrigin + new float2(screenX, -5), 1, Color.White);
if (i % XAxisTicksPerLabel == 0)
{
var xAxisText = GetXAxisValueFormat().FormatCurrent(i / XAxisTicksPerLabel);
var xAxisTickTextWidth = labelFont.Measure(xAxisText).X;
var xLocation = screenX - xAxisTickTextWidth / 2;
labelFont.DrawTextWithShadow(xAxisText,
graphOrigin + new float2(xLocation, 2),
Color.White, BackgroundColorDark, BackgroundColorLight, 1);
}
}
}
// Disable clipping after drawing x-axis labels
Game.Renderer.DisableScissor();
// Draw y axis
axisFont.DrawTextWithShadow(yAxisLabel,
new float2(origin.X, graphOrigin.Y) + new float2(5 - axisFont.TopOffset, -(height / 2 - yAxisLabelSize.X / 2)),
@@ -228,6 +456,146 @@ namespace OpenRA.Mods.Common.Widgets
{
return new ScrollableLineGraphWidget(this);
}
public override bool YieldMouseFocus(MouseInput mi)
{
leftPressed = rightPressed = thumbPressed = false;
return base.YieldMouseFocus(mi);
}
public override bool HandleMouseInput(MouseInput mi)
{
if (mi.Event == MouseInputEvent.Scroll && EventBounds.Contains(mi.Location))
{
Scroll(mi.Delta.Y, true);
return true;
}
if (mi.Button != MouseButton.Left)
return false;
if (mi.Event == MouseInputEvent.Down && !TakeMouseFocus(mi))
return false;
if (!HasMouseFocus)
return false;
if (mi.Event == MouseInputEvent.Up)
{
leftPressed = rightPressed = thumbPressed = false;
YieldMouseFocus(mi);
return true;
}
if (mi.Event == MouseInputEvent.Move && thumbPressed)
{
var deltaX = mi.Location.X - lastMousePos.X;
var series = GetSeries();
if (series.Any())
{
var pointCount = series.Max(s => s.Points.Count());
var rect = RenderBounds;
var font = GetLabelFont();
if (font == null)
return false;
var labelFont = Game.Renderer.Fonts[font];
var axisFont = Game.Renderer.Fonts[GetAxisFont()];
var maxValue = series.Select(p => p.Points).SelectMany(d => d).Concat([0f]).Max();
var longestName = series.Select(s => s.Key).OrderByDescending(s => s.Length).FirstOrDefault() ?? "";
var scaledMaxValue = Math.Max((float)Math.Ceiling(maxValue / 1000) * 1000, 5000f);
var widthMaxValue = labelFont.Measure(GetYAxisValueFormat().FormatCurrent(scaledMaxValue)).X;
var widthLongestName = labelFont.Measure(longestName).X;
var yAxisLabel = GetYAxisLabel();
var yAxisLabelSize = axisFont.Measure(yAxisLabel);
var width = rect.Width - (Padding * 10 + widthMaxValue + widthLongestName + yAxisLabelSize.Y);
var totalDataWidth = pointCount * (width / GetXAxisSize());
var maxHorizontalOffset = Math.Max(0, totalDataWidth - width);
if (maxHorizontalOffset > 0)
{
var availableThumbSpace = scrollbarRect.Width - 2 * ScrollbarHeight;
var proportionalThumbSize = availableThumbSpace * width / totalDataWidth;
var actualThumbSize = Math.Max(MinimumThumbWidth, Math.Min(proportionalThumbSize, availableThumbSpace - MinimumThumbWidth * 2));
var thumbRange = availableThumbSpace - actualThumbSize;
if (thumbRange > 0)
{
var scrollAmount = deltaX / (float)thumbRange * maxHorizontalOffset;
SetHorizontalOffset(targetHorizontalOffset - scrollAmount, false);
autoScrollEnabled = false;
manuallyScrolled = true;
}
}
}
lastMousePos = mi.Location;
return true;
}
if (mi.Event == MouseInputEvent.Down)
{
if (leftButtonRect.Contains(mi.Location) && !leftDisabled)
{
leftPressed = true;
Scroll(1, true);
PlayClickSound();
return true;
}
else if (rightButtonRect.Contains(mi.Location) && !rightDisabled)
{
rightPressed = true;
Scroll(-1, true);
PlayClickSound();
return true;
}
else if (thumbRect.Contains(mi.Location))
{
thumbPressed = true;
lastMousePos = mi.Location;
autoScrollEnabled = false;
manuallyScrolled = true;
PlayClickSound();
return true;
}
else if (scrollbarRect.Contains(mi.Location))
{
var clickX = mi.Location.X;
var thumbCenterX = thumbRect.Left + thumbRect.Width / 2;
if (clickX < thumbCenterX)
Scroll(2, true);
else
Scroll(-2, true);
return true;
}
}
return false;
}
void PlayClickSound()
{
if ((thumbPressed && (!rightDisabled || !leftDisabled)) || (rightPressed && !rightDisabled) || (leftPressed && !leftDisabled))
Game.Sound.PlayNotification(ModRules, null, "Sounds", ClickSound, null);
else if ((rightPressed && rightDisabled) || (leftPressed && leftDisabled))
Game.Sound.PlayNotification(ModRules, null, "Sounds", ClickDisabledSound, null);
}
public override void Tick()
{
if (leftPressed && !leftDisabled)
Scroll(1, true);
if (rightPressed && !rightDisabled)
Scroll(-1, true);
}
}
public record ScrollableLineGraphSeries(string Key, Color Color, IEnumerable<float> Points);

8
mods/cnc/chrome/ingame.yaml
View File

@@ -1119,7 +1119,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@INCOME_GRAPH:
ScrollableLineGraph@INCOME_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1132,6 +1132,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Earnings
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@ARMY_VALUE_GRAPH_CONTAINER:
X: 0
Y: 30
@@ -1145,7 +1147,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@ARMY_VALUE_GRAPH:
ScrollableLineGraph@ARMY_VALUE_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1158,6 +1160,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Army Value
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@PLAYER_WIDGETS:
Logic: LoadIngamePerfLogic, LoadIngameChatLogic

4
mods/d2k/chrome.yaml
View File

@@ -506,6 +506,10 @@ scrollpanel-decorations:
Regions:
down: 119, 0, 16, 16
up: 102, 0, 16, 16
right: 136, 17, 16, 16
right-disabled: 153, 17, 16, 16
left: 170, 17, 16, 16
left-disabled: 187, 17, 16, 16
dropdown-decorations:
Inherits: ^Glyphs

8
mods/d2k/chrome/ingame-observer.yaml
View File

@@ -1008,7 +1008,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@INCOME_GRAPH:
ScrollableLineGraph@INCOME_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1021,6 +1021,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Earnings
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@ARMY_VALUE_GRAPH_CONTAINER:
X: 0
Y: 30
@@ -1034,7 +1036,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@ARMY_VALUE_GRAPH:
ScrollableLineGraph@ARMY_VALUE_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1047,6 +1049,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Army Value
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@HPF_ROOT:
Logic: LoadIngameHierarchicalPathFinderOverlayLogic
X: WINDOW_WIDTH - WIDTH - 260

8
mods/ra/chrome/ingame-observer.yaml
View File

@@ -1057,7 +1057,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@INCOME_GRAPH:
ScrollableLineGraph@INCOME_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1070,6 +1070,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Earnings
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: observer-scrollpanel-button-pressed
ScrollbarButton: observer-scrollpanel-button
Container@ARMY_VALUE_GRAPH_CONTAINER:
X: 0
Y: 30
@@ -1083,7 +1085,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@ARMY_VALUE_GRAPH:
ScrollableLineGraph@ARMY_VALUE_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1096,6 +1098,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Army Value
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: observer-scrollpanel-button-pressed
ScrollbarButton: observer-scrollpanel-button
Container@HPF_ROOT:
Logic: LoadIngameHierarchicalPathFinderOverlayLogic
X: WINDOW_WIDTH - WIDTH - 255

8
mods/ts/chrome/ingame-observer.yaml
View File

@@ -1002,7 +1002,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@INCOME_GRAPH:
ScrollableLineGraph@INCOME_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1015,6 +1015,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Earnings
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@ARMY_VALUE_GRAPH_CONTAINER:
X: 0
Y: 30
@@ -1028,7 +1030,7 @@ Container@OBSERVER_WIDGETS:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Color: 00000090
LineGraph@ARMY_VALUE_GRAPH:
ScrollableLineGraph@ARMY_VALUE_GRAPH:
X: 0
Y: 0
Width: PARENT_WIDTH - 5
@@ -1041,6 +1043,8 @@ Container@OBSERVER_WIDGETS:
YAxisLabel: Army Value
LabelFont: TinyBold
AxisFont: TinyBold
ScrollbarBackground: scrollpanel-button-pressed
ScrollbarButton: scrollpanel-button
Container@HPF_ROOT:
Logic: LoadIngameHierarchicalPathFinderOverlayLogic
X: WINDOW_WIDTH - WIDTH - 260