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

Polish SliderWidget:

Browse Source 
- Keep thumb within the EventBounds.
- Fix tick rendering.
This commit is contained in:
Paul Chote
2013-10-23 18:49:37 +13:00
parent 94554d7678
commit 64a229d339
5 changed files with 19 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/Widgets/SliderWidget.cs
View File

@@ -82,8 +82,8 @@ namespace OpenRA.Widgets
return ThumbRect.Contains(mi.Location);
}
float ValueFromPx(int x) { return MinimumValue + (MaximumValue - MinimumValue) * (1f * x / RenderBounds.Width); }
protected int PxFromValue(float x) { return (int)(RenderBounds.Width * (x - MinimumValue) / (MaximumValue - MinimumValue)); }
float ValueFromPx(int x) { return MinimumValue + (MaximumValue - MinimumValue) * (x - 0.5f * RenderBounds.Height) / (RenderBounds.Width - RenderBounds.Height); }
protected int PxFromValue(float x) { return (int)(0.5f * RenderBounds.Height + (RenderBounds.Width - RenderBounds.Height) * (x - MinimumValue) / (MaximumValue - MinimumValue)); }
public override Widget Clone() { return new SliderWidget(this); }
@@ -109,16 +109,19 @@ namespace OpenRA.Widgets
var tr = ThumbRect;
var rb = RenderBounds;
var trackWidth = rb.Width;
var trackOrigin = rb.X;
var trackWidth = rb.Width - rb.Height;
var trackOrigin = rb.X + rb.Height / 2;
var trackRect = new Rectangle(trackOrigin - 1, rb.Y + (rb.Height - TrackHeight) / 2, trackWidth + 2, TrackHeight);
// Tickmarks (hacked until we have real art)
// Tickmarks
var tick = ChromeProvider.GetImage("slider", "tick");
for (int i = 0; i < Ticks; i++)
{
var tickRect = new Rectangle(trackOrigin - 1 + (int)(i * trackWidth * 1f / (Ticks - 1)),
rb.Y + rb.Height / 2, 2, rb.Height / 2);
WidgetUtils.DrawPanel("slider-tick", tickRect);
var tickPos = new float2(
trackOrigin + (i * (trackRect.Width - (int)tick.size.X) / (Ticks - 1)) - tick.size.X / 2,
trackRect.Bottom);
WidgetUtils.DrawRGBA(tick, tickPos);
}
// Track

13
mods/cnc/chrome.yaml
View File

@@ -251,17 +251,8 @@ scrollitem-selected: chrome.png
corner-bl: 64,254,2,2
corner-br: 126,254,2,2
# A copy of panel-gray
slider-tick: chrome.png
background: 66,66,60,60
border-r: 126,66,2,60
border-l: 64,66,2,60
border-b: 66,126,60,2
border-t: 66,64,60,2
corner-tl: 64,64,2,2
corner-tr: 126,64,2,2
corner-bl: 64,126,2,2
corner-br: 126,126,2,2
slider: chrome.png
tick: 64,64,1,4
# A copy of panel-gray
slider-track: chrome.png

14
mods/d2k/chrome.yaml
View File

@@ -492,18 +492,8 @@ scrollpanel-bg: dialog.png
corner-bl: 640,127,1,1
corner-br: 767,127,1,1
# A copy of dialog2 (normal button)
slider-tick: 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: 639,0,1,1
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
slider: dialog.png
tick: 512,1,2,4
# A copy of dialog3 (pressed button)
slider-track: dialog.png

13
mods/ra/chrome.yaml
View File

@@ -442,17 +442,8 @@ scrollpanel-bg: dialog.png
corner-bl: 640,127,1,1
corner-br: 767,127,1,1
# A copy of dialog2 (normal button)
slider-tick: 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: 639,0,1,1
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
slider: dialog.png
tick: 512,1,2,4
# A copy of dialog3 (pressed button)
slider-track: dialog.png

14
mods/ts/chrome.yaml
View File

@@ -436,18 +436,8 @@ scrollpanel-bg: dialog.png
corner-bl: 640,127,1,1
corner-br: 767,127,1,1
# A copy of dialog2 (normal button)
slider-tick: 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: 639,0,1,1
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
slider: dialog.png
tick: 512,1,1,4
# A copy of dialog3 (pressed button)
slider-track: dialog.png