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

Fix progressbars

Browse Source
This commit is contained in:
Paul Chote
2011-05-16 21:27:41 +12:00
parent a9bbb5f5c2
commit 3eb3ae76f0
3 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/Widgets/ProgressBarWidget.cs
View File

@@ -19,37 +19,46 @@ namespace OpenRA.Widgets
{ {
public int Percentage = 0; public int Percentage = 0;
public bool Indeterminate = false; public bool Indeterminate = false;
int indeterminateTick = 0;
// Indeterminant bar properties
float offset = 0f;
float tickStep = 0.04f;
public ProgressBarWidget() : base() {} public ProgressBarWidget() : base() {}
protected ProgressBarWidget(ProgressBarWidget widget) protected ProgressBarWidget(ProgressBarWidget widget)
: base(widget) : base(widget)
{ {
Percentage = widget.Percentage; Percentage = widget.Percentage;
} }
public override void DrawInner() public override void DrawInner()
{ {
var rb = RenderBounds; var rb = RenderBounds;
WidgetUtils.DrawPanel("dialog3", rb); WidgetUtils.DrawPanel("progressbar-bg", rb);
Rectangle barRect = Indeterminate ? Rectangle barRect = Indeterminate ?
new Rectangle(rb.X + 2 + (int)((rb.Width - 4)*(-Math.Cos(Math.PI*2*indeterminateTick/100) + 1)*3/8), rb.Y + 2, (rb.Width - 4) / 4, rb.Height - 4) : new Rectangle(rb.X + 2 + (int)(0.75*offset*(rb.Width - 4)), rb.Y + 2, (rb.Width - 4) / 4, rb.Height - 4) :
new Rectangle(rb.X + 2, rb.Y + 2, Percentage * (rb.Width - 4) / 100, rb.Height - 4); new Rectangle(rb.X + 2, rb.Y + 2, Percentage * (rb.Width - 4) / 100, rb.Height - 4);
if (barRect.Width > 0) if (barRect.Width > 0)
WidgetUtils.DrawPanel("dialog2", barRect); WidgetUtils.DrawPanel("progressbar-thumb", barRect);
} }
public override void Tick() public override void Tick()
{ {
if (Indeterminate && indeterminateTick++ >= 100) if (Indeterminate)
indeterminateTick = 0; {
offset += tickStep;
offset = offset.Clamp(0f, 1f);
if (offset == 0f || offset == 1f)
tickStep *= -1;
}
} }
public void SetIndeterminate(bool value) public void SetIndeterminate(bool value)
{ {
Indeterminate = value; Indeterminate = value;
indeterminateTick = 0; offset = 0f;
} }
public override Widget Clone() { return new ProgressBarWidget(this); } public override Widget Clone() { return new ProgressBarWidget(this); }

24
mods/cnc/chrome.yaml
View File

@@ -48,6 +48,30 @@ button-pressed: chrome.png
corner-bl: 64,254,2,2 corner-bl: 64,254,2,2
corner-br: 126,254,2,2 corner-br: 126,254,2,2
# A copy of button
progressbar-bg: chrome.png
background: 2,194,60,60
border-r: 62,194,2,60
border-l: 0,194,2,60
border-b: 2,254,60,2
border-t: 2,192,60,2
corner-tl: 0,192,2,2
corner-tr: 62,192,2,2
corner-bl: 0,254,2,2
corner-br: 62,254,2,2
# A copy of button-hover
progressbar-thumb: chrome.png
background: 2,130,60,60
border-r: 62,132,2,60
border-l: 0,130,2,60
border-b: 2,190,60,2
border-t: 2,128,60,2
corner-tl: 0,128,2,2
corner-tr: 62,128,2,2
corner-bl: 0,190,2,2
corner-br: 62,190,2,2
panel-black: chrome.png panel-black: chrome.png
background: 66,2,60,60 background: 66,2,60,60
border-r: 126,2,2,60 border-r: 126,2,2,60

23
mods/ra/chrome.yaml
View File

@@ -214,3 +214,26 @@ scrollbar: buttons.png
checkbox: buttons.png checkbox: buttons.png
checked: 0,112,16,16 checked: 0,112,16,16
# A copy of dialog3
progressbar-bg: dialog.png
background: 641,1,126,126
border-r: 767,1,1,126
border-l: 640,1,1,126
border-b: 641,127,126,1
border-t: 641,0,126,1
corner-tl: 640,0,1,1
corner-tr: 722,0,1,1
corner-bl: 640,82,1,1
corner-br: 722,82,1,1
# A copy of dialog2
progressbar-thumb: dialog.png
background: 513,1,126,126
border-r: 639,1,1,126
border-l: 512,1,1,126
border-b: 513,127,126,1
border-t: 513,0,126,1
corner-tl: 512,0,1,1
corner-tr: 594,0,1,1
corner-bl: 512,82,1,1
corner-br: 594,82,1,1