diff --git a/OpenRA.Game/Widgets/SliderWidget.cs b/OpenRA.Game/Widgets/SliderWidget.cs index 60eb8dc6a5..c8e793d50b 100755 --- a/OpenRA.Game/Widgets/SliderWidget.cs +++ b/OpenRA.Game/Widgets/SliderWidget.cs @@ -20,7 +20,8 @@ namespace OpenRA.Widgets public event Action OnChange = _ => {}; public int Ticks = 0; public int TrackHeight = 5; - + public string Thumb = "slider-thumb"; + public string Track = "slider-track"; public float MinimumValue = 0; public float MaximumValue = 1; public float Value = 0; @@ -124,11 +125,11 @@ namespace OpenRA.Widgets } // Track - WidgetUtils.DrawPanel("slider-track", trackRect); + WidgetUtils.DrawPanel(Track, trackRect); // Thumb var thumbHover = Ui.MouseOverWidget == this && tr.Contains(Viewport.LastMousePos); - ButtonWidget.DrawBackground("scrollthumb", tr, IsDisabled(), isMoving, thumbHover, false); + ButtonWidget.DrawBackground(Thumb, tr, IsDisabled(), isMoving, thumbHover, false); } } } diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index cdf4e000b0..07323716c3 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -266,7 +266,50 @@ slider-track: chrome.png corner-bl: 64,126,2,2 corner-br: 126,126,2,2 +slider-thumb: 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 +slider-thumb-hover: chrome.png + background: 2,130,60,60 + border-r: 62,130,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 + +slider-thumb-disabled: chrome.png + background: 66,130,60,60 + border-r: 126,130,2,60 + border-l: 64,130,2,60 + border-b: 66,190,60,2 + border-t: 66,128,60,2 + corner-tl: 64,128,2,2 + corner-tr: 126,128,2,2 + corner-bl: 64,190,2,2 + corner-br: 126,190,2,2 + +slider-thumb-pressed: chrome.png + background: 66,194,60,60 + border-r: 126,194,2,60 + border-l: 64,194,2,60 + border-b: 66,254,60,2 + border-t: 66,192,60,2 + corner-tl: 64,192,2,2 + corner-tr: 126,192,2,2 + corner-bl: 64,254,2,2 + corner-br: 126,254,2,2 + # A copy of button checkbox: chrome.png background: 2,194,60,60 diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index 77bd0104f0..93421d2a01 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -508,6 +508,54 @@ slider-track: dialog.png corner-bl: 512,127,1,1 corner-br: 639,127,1,1 +# A copy of dialog2 (normal button) +slider-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: 639,0,1,1 + corner-bl: 512,127,1,1 + corner-br: 639,127,1,1 + +# A copy of button-hover +slider-thumb-hover: dialog.png + background: 513,129,126,126 + border-r: 639,129,1,126 + border-l: 512,129,1,126 + border-b: 513,255,126,1 + border-t: 513,128,126,1 + corner-tl: 512,128,1,1 + corner-tr: 639,128,1,1 + corner-bl: 512,255,1,1 + corner-br: 639,255,1,1 + +# A copy of dialog3 (pressed button) +slider-thumb-pressed: 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: 767,0,1,1 + corner-bl: 640,127,1,1 + corner-br: 767,127,1,1 + +# A copy of dialog2 (normal button) +slider-thumb-disabled: 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 + # A copy of dialog3 (pressed button) checkbox: dialog.png background: 641,1,126,126 diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index e4babd0821..7b967849dd 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -666,6 +666,54 @@ slider-track: dialog.png corner-tr: 639,0,1,1 corner-bl: 512,127,1,1 corner-br: 639,127,1,1 + +# A copy of dialog2 (normal button) +slider-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: 639,0,1,1 + corner-bl: 512,127,1,1 + corner-br: 639,127,1,1 + +# A copy of button-hover +slider-thumb-hover: dialog.png + background: 513,129,126,126 + border-r: 639,129,1,126 + border-l: 512,129,1,126 + border-b: 513,255,126,1 + border-t: 513,128,126,1 + corner-tl: 512,128,1,1 + corner-tr: 639,128,1,1 + corner-bl: 512,255,1,1 + corner-br: 639,255,1,1 + +# A copy of dialog3 (pressed button) +slider-thumb-pressed: 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: 767,0,1,1 + corner-bl: 640,127,1,1 + corner-br: 767,127,1,1 + +# A copy of dialog2 (normal button) +slider-thumb-disabled: 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 # A copy of dialog3 (pressed button) checkbox: dialog.png diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml index f3a33ac644..b8551e74da 100644 --- a/mods/ts/chrome.yaml +++ b/mods/ts/chrome.yaml @@ -520,6 +520,54 @@ slider-track: dialog.png corner-bl: 640,127,1,1 corner-br: 767,127,1,1 + # A copy of dialog2 (normal button) +slider-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: 639,0,1,1 + corner-bl: 512,127,1,1 + corner-br: 639,127,1,1 + +# A copy of button-hover +slider-thumb-hover: dialog.png + background: 513,129,126,126 + border-r: 639,129,1,126 + border-l: 512,129,1,126 + border-b: 513,255,126,1 + border-t: 513,128,126,1 + corner-tl: 512,128,1,1 + corner-tr: 639,128,1,1 + corner-bl: 512,255,1,1 + corner-br: 639,255,1,1 + +# A copy of dialog3 (pressed button) +slider-thumb-pressed: 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: 767,0,1,1 + corner-bl: 640,127,1,1 + corner-br: 767,127,1,1 + +# A copy of dialog2 (normal button) +slider-thumb-disabled: 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 + # A copy of dialog3 (pressed button) checkbox: dialog.png background: 641,1,126,126