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

Indeterminate progress bar

Browse Source
This commit is contained in:
Paul Chote
2011-01-22 09:40:50 +13:00
parent 3609de8ca5
commit d39adf67b2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ namespace OpenRA.Widgets
public class ProgressBarWidget : Widget public class ProgressBarWidget : Widget
{ {
public int Percentage = 0; public int Percentage = 0;
public bool Indeterminate = false;
int indeterminateTick = 0;
public ProgressBarWidget() : base() {} public ProgressBarWidget() : base() {}
protected ProgressBarWidget(ProgressBarWidget widget) protected ProgressBarWidget(ProgressBarWidget widget)
@@ -29,12 +31,20 @@ namespace OpenRA.Widgets
public override void DrawInner() public override void DrawInner()
{ {
WidgetUtils.DrawPanel("dialog3", RenderBounds); WidgetUtils.DrawPanel("dialog3", RenderBounds);
Rectangle barRect = Indeterminate ?
new Rectangle(RenderBounds.X + 2 + (int)((RenderBounds.Width - 4)*(-Math.Cos(Math.PI*2*indeterminateTick/100) + 1)*3/8), RenderBounds.Y + 2, (RenderBounds.Width - 4) / 4, RenderBounds.Height - 4) :
new Rectangle(RenderBounds.X + 2, RenderBounds.Y + 2, Percentage * (RenderBounds.Width - 4) / 100, RenderBounds.Height - 4);
var barRect = new Rectangle(RenderBounds.X + 2, RenderBounds.Y + 2, Percentage * (RenderBounds.Width - 4) / 100, RenderBounds.Height - 4);
if (barRect.Width > 0) if (barRect.Width > 0)
WidgetUtils.DrawPanel("dialog2", barRect); WidgetUtils.DrawPanel("dialog2", barRect);
} }
public override void Tick()
{
if (Indeterminate && indeterminateTick++ >= 100)
indeterminateTick = 0;
}
public override Widget Clone() { return new ProgressBarWidget(this); } public override Widget Clone() { return new ProgressBarWidget(this); }
} }
} }

7
OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
View File

@@ -90,12 +90,12 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
window = Widget.OpenWindow("INIT_COPY"); window = Widget.OpenWindow("INIT_COPY");
var status = window.GetWidget<LabelWidget>("STATUS"); var status = window.GetWidget<LabelWidget>("STATUS");
var progress = window.GetWidget<ProgressBarWidget>("PROGRESS"); var progress = window.GetWidget<ProgressBarWidget>("PROGRESS");
progress.Indeterminate = true;
// TODO: Handle cancelling copy // TODO: Handle cancelling copy
// TODO: Make the progress bar indeterminate window.GetWidget<ButtonWidget>("CANCEL").IsVisible = () => false;
window.GetWidget("CANCEL").OnMouseUp = mi => { ShowInstallMethodDialog(); return true; }; window.GetWidget("CANCEL").OnMouseUp = mi => { ShowInstallMethodDialog(); return true; };
window.GetWidget("RETRY").OnMouseUp = mi => PromptForCD(); window.GetWidget("RETRY").OnMouseUp = mi => PromptForCD();
window.GetWidget<ButtonWidget>("CANCEL").IsVisible = () => false;
status.GetText = () => "Copying..."; status.GetText = () => "Copying...";
var error = false; var error = false;
@@ -144,6 +144,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
else if (!cancelled) else if (!cancelled)
{ {
// Automatically extract // Automatically extract
status.GetText = () => "Extracting...";
progress.Indeterminate = true; progress.Indeterminate = true;
var error = false; var error = false;
Action<string> parseOutput = s => Action<string> parseOutput = s =>