Use generic Slide<T>

xoofx · xoofx · commit ab89ac8203de · 2026-01-17T20:45:50.000+01:00
diff --git a/samples/ControlsDemo/Demos/ScrollBarDemo.cs b/samples/ControlsDemo/Demos/ScrollBarDemo.cs
@@ -18,21 +18,21 @@ public override Visual Build(DemoContext context)
             .Minimum(0)
             .Maximum(100)
             .ViewportSize(20)
-            .ScrollValue(40);
+            .Value(40);
 
         var h = new HScrollBar(focusable: true)
             .Minimum(0)
             .Maximum(100)
             .ViewportSize(30)
-            .ScrollValue(60);
+            .Value(60);
 
         return new VStack(
                 DemoUi.Hint("ScrollBar exposes Minimum/Maximum/Value and a ValueChanged event."),
                 new HStack(
                         new VStack(v.MinHeight(20).MaxHeight(20)).HorizontalAlignment(HorizontalAlignment.Left).VerticalAlignment(VerticalAlignment.Top),
                         new VStack(h).MinWidth(50).MaxWidth(50).HorizontalAlignment(HorizontalAlignment.Left).VerticalAlignment(VerticalAlignment.Top))
                     .Spacing(2),
-                new TextBlock(() => $"Vertical: {v.ScrollValue}, Horizontal: {h.ScrollValue}"))
+                new TextBlock(() => $"Vertical: {v.Value}, Horizontal: {h.Value}"))
             .Spacing(1);
     }
 }
diff --git a/samples/ControlsDemo/Demos/SliderDemo.cs b/samples/ControlsDemo/Demos/SliderDemo.cs
@@ -12,20 +12,20 @@ public SliderDemo() : base(DemoSource.Get())
 
     public override Visual Build(DemoContext context)
     {
-        var value = new State<double>(0.35);
+        var value = new State<int>(35);
 
         return new VStack(
                 DemoUi.Hint("Slider can be controlled with keyboard or mouse drag."),
-                new Slider
+                new Slider<int>
                 {
-                    Minimum = 0.0,
-                    Maximum = 1.0,
-                    Step = 0.05,
+                    Minimum = 0,
+                    Maximum = 100,
+                    Step = 5,
                     ShowValueLabel = true,
-                    ValueFormatter = v => $"{(int)Math.Round(v * 100)}%",
+                    ValueFormatter = v => $"{v}%",
                 }.Value(value),
-                new TextBlock(() => $"Value: {value.Value:0.00}"),
-                new Button("Log value").Click(() => context.Log($"Slider: {value.Value:0.00}")))
+                new TextBlock(() => $"Value: {value.Value}%"),
+                new Button("Log value").Click(() => context.Log($"Slider: {value.Value}%")))
             .Spacing(1);
     }
 }
diff --git a/samples/ControlsDemo/Demos/TextFigletDemo.cs b/samples/ControlsDemo/Demos/TextFigletDemo.cs
@@ -19,22 +19,22 @@ public override Visual Build(DemoContext context)
         _ = context;
 
         var text = new State<string?>("XenoAtom");
-        var spacing = new State<double>(1);
+        var spacing = new State<int>(1);
 
         return new VStack(
                 DemoUi.Hint("TextFiglet renders multi-line banner text. Bind Text to a State to update live."),
                 new HStack(
                         new TextBlock("Text:"),
                         new TextBox().Text(text).MinWidth(20).MaxWidth(20),
                         new TextBlock("Spacing:"),
-                        new Slider().Minimum(1).Maximum(8).Value(spacing).MinWidth(16).MaxWidth(16),
-                        new TextBlock(() => $"{(int)spacing.Value}"))
+                        new Slider<int>().Minimum(1).Maximum(8).Value(spacing).MinWidth(16).MaxWidth(16),
+                        new TextBlock(() => $"{spacing.Value}"))
                     .Spacing(1).VerticalAlignment(VerticalAlignment.Top),
                 new Border(
                     new TextFiglet()
                         .Text(text)
                         .Font(FigletFont.Standard)
-                        .LetterSpacing(() => (int)spacing.Value)
+                        .LetterSpacing(spacing)
                         .TextAlignment(TextAlignment.Left)
                         .Style(TextFigletStyle.Default with
                         {
diff --git a/samples/FullscreenDemo/Program.cs b/samples/FullscreenDemo/Program.cs
@@ -175,7 +175,7 @@ void ShowModalDialog()
             .HorizontalAlignment(HorizontalAlignment.Stretch),
         new HStack(
                 "Slider:",
-                new Slider()
+                new Slider<double>()
                     .Minimum(0)
                     .Maximum(1)
                     .Step(0.05)
diff --git a/src/XenoAtom.Terminal.UI.SourceGen/TerminalUiGenerator.cs b/src/XenoAtom.Terminal.UI.SourceGen/TerminalUiGenerator.cs
diff --git a/src/XenoAtom.Terminal.UI.Tests/ScrollViewerLayoutTests.cs b/src/XenoAtom.Terminal.UI.Tests/ScrollViewerLayoutTests.cs
@@ -15,7 +15,7 @@ public sealed class ScrollViewerLayoutTests
     [TestMethod]
     public void ScrollViewer_Stretches_Content_To_Viewport_When_NoHorizontalScrolling()
     {
-        var content = new VStack("Hello");
+        var content = new VStack("Hello").VerticalAlignment(VerticalAlignment.Stretch);
         var scroll = new ScrollViewer(content);
 
         var root = new DockLayout().Content(scroll);
diff --git a/src/XenoAtom.Terminal.UI.Tests/SliderValueTests.cs b/src/XenoAtom.Terminal.UI.Tests/SliderValueTests.cs
@@ -11,7 +11,7 @@ public sealed class SliderValueTests
     [TestMethod]
     public void Value_Is_Clamped_To_Range()
     {
-        var slider = new Slider
+        var slider = new Slider<int>
         {
             Minimum = 0,
             Maximum = 10,
@@ -28,7 +28,7 @@ public void Value_Is_Clamped_To_Range()
     [TestMethod]
     public void Value_Snaps_To_Step()
     {
-        var slider = new Slider
+        var slider = new Slider<int>
         {
             Minimum = 0,
             Maximum = 10,
@@ -43,7 +43,7 @@ public void Value_Snaps_To_Step()
     [TestMethod]
     public void Range_Is_Kept_Consistent()
     {
-        var slider = new Slider();
+        var slider = new Slider<int>();
         slider.Maximum = 0;
         slider.Minimum = 5;
 
@@ -52,4 +52,3 @@ public void Range_Is_Kept_Consistent()
         Assert.AreEqual(5, slider.Value);
     }
 }
-
diff --git a/src/XenoAtom.Terminal.UI/Controls/ScrollBar.cs b/src/XenoAtom.Terminal.UI/Controls/ScrollBar.cs
@@ -38,12 +38,7 @@ protected ScrollBar(bool focusable = true)
             HorizontalAlignment = HorizontalAlignment.Stretch;
         }
 
-        this.Minimum(0);
-        this.Maximum(0);
-        this.ScrollValue(0);
-        this.ViewportSize(0);
-        this.SmallChange(1);
-        this.LargeChange(0);
+        this.SmallChange = 1;
     }
 
     /// <summary>
@@ -67,7 +62,7 @@ protected ScrollBar(bool focusable = true)
     /// Gets or sets the current value.
     /// </summary>
     [Bindable]
-    public partial int ScrollValue { get; set; }
+    public partial int Value { get; set; }
 
     /// <summary>
     /// Gets or sets the viewport size, used to compute the thumb length.
@@ -93,13 +88,13 @@ protected ScrollBar(bool focusable = true)
 
     partial void OnLargeChangeChanging(ref int value) => ArgumentOutOfRangeException.ThrowIfNegative(value);
 
-    partial void OnScrollValueChanging(ref int value)
+    partial void OnValueChanging(ref int value)
     {
-        _oldValueForEvent = _scrollValue;
+        _oldValueForEvent = _value;
         value = Clamp(value);
     }
 
-    partial void OnScrollValueChanged(int value)
+    partial void OnValueChanged(int value)
     {
         if (_oldValueForEvent != value)
         {
@@ -248,7 +243,7 @@ private void RenderHorizontal(CellBuffer buffer, Rectangle rect, ScrollBarGlyphs
         thumbLength = Math.Clamp(thumbLength, minThumb, trackLength);
 
         var trackAvail = Math.Max(1, trackLength - thumbLength);
-        var offset = Math.Clamp(ScrollValue - min, 0, range);
+        var offset = Math.Clamp(Value - min, 0, range);
         var thumbStart = (int)Math.Round((double)offset * trackAvail / range);
         thumbStart = Math.Clamp(thumbStart, 0, trackLength - thumbLength);
 
@@ -278,7 +273,7 @@ protected override void OnPointerPressed(PointerEventArgs e)
             _dragging = true;
             _dragStartUiX = e.UiX;
             _dragStartUiY = e.UiY;
-            _dragStartValue = ScrollValue;
+            _dragStartValue = Value;
             e.Handled = true;
             return;
         }
@@ -290,7 +285,7 @@ protected override void OnPointerPressed(PointerEventArgs e)
             page = Math.Max(1, ViewportSize);
         }
 
-        ScrollValue = local < thumbStart ? ScrollValue - page : ScrollValue + page;
+        Value = local < thumbStart ? Value - page : Value + page;
         e.Handled = true;
     }
 
@@ -327,7 +322,7 @@ protected override void OnPointerMoved(PointerEventArgs e)
 
         var delta = Orientation == Orientation.Vertical ? (e.UiY - _dragStartUiY) : (e.UiX - _dragStartUiX);
         var deltaValue = (int)Math.Round((double)delta * range / trackAvail);
-        ScrollValue = Math.Clamp(_dragStartValue + deltaValue, min, max);
+        Value = Math.Clamp(_dragStartValue + deltaValue, min, max);
         e.Handled = true;
     }
 
@@ -355,7 +350,7 @@ protected override void OnPointerWheel(PointerEventArgs e)
         }
 
         var step = Math.Max(1, SmallChange);
-        ScrollValue = e.WheelDelta > 0 ? ScrollValue - step : ScrollValue + step;
+        Value = e.WheelDelta > 0 ? Value - step : Value + step;
         e.Handled = true;
     }
 
@@ -370,27 +365,27 @@ protected override void OnKeyDown(KeyEventArgs e)
             switch (e.Key)
             {
                 case TerminalKey.Up:
-                    ScrollValue -= step;
+                    Value -= step;
                     e.Handled = true;
                     return;
                 case TerminalKey.Down:
-                    ScrollValue += step;
+                    Value += step;
                     e.Handled = true;
                     return;
                 case TerminalKey.PageUp:
-                    ScrollValue -= page;
+                    Value -= page;
                     e.Handled = true;
                     return;
                 case TerminalKey.PageDown:
-                    ScrollValue += page;
+                    Value += page;
                     e.Handled = true;
                     return;
                 case TerminalKey.Home:
-                    ScrollValue = Minimum;
+                    Value = Minimum;
                     e.Handled = true;
                     return;
                 case TerminalKey.End:
-                    ScrollValue = Maximum;
+                    Value = Maximum;
                     e.Handled = true;
                     return;
             }
@@ -400,27 +395,27 @@ protected override void OnKeyDown(KeyEventArgs e)
             switch (e.Key)
             {
                 case TerminalKey.Left:
-                    ScrollValue -= step;
+                    Value -= step;
                     e.Handled = true;
                     return;
                 case TerminalKey.Right:
-                    ScrollValue += step;
+                    Value += step;
                     e.Handled = true;
                     return;
                 case TerminalKey.PageUp:
-                    ScrollValue -= page;
+                    Value -= page;
                     e.Handled = true;
                     return;
                 case TerminalKey.PageDown:
-                    ScrollValue += page;
+                    Value += page;
                     e.Handled = true;
                     return;
                 case TerminalKey.Home:
-                    ScrollValue = Minimum;
+                    Value = Minimum;
                     e.Handled = true;
                     return;
                 case TerminalKey.End:
-                    ScrollValue = Maximum;
+                    Value = Maximum;
                     e.Handled = true;
                     return;
             }
diff --git a/src/XenoAtom.Terminal.UI/Controls/ScrollViewer.cs b/src/XenoAtom.Terminal.UI/Controls/ScrollViewer.cs
@@ -598,15 +598,15 @@ private void OnHorizontalBarValueChanged(object? sender, ScrollValueChangedEvent
 
     private void SetBarValue(ScrollBar bar, int value)
     {
-        if (bar.ScrollValue == value)
+        if (bar.Value == value)
         {
             return;
         }
 
         _syncingOffsets = true;
         try
         {
-            bar.ScrollValue = value;
+            bar.Value = value;
         }
         finally
         {
diff --git a/src/XenoAtom.Terminal.UI/Controls/Slider.cs b/src/XenoAtom.Terminal.UI/Controls/Slider.cs
diff --git a/src/XenoAtom.Terminal.UI/Input/ValueChangedEventArgs.cs b/src/XenoAtom.Terminal.UI/Input/ValueChangedEventArgs.cs
diff --git a/src/XenoAtom.Terminal.UI/Styling/SliderStyle.cs b/src/XenoAtom.Terminal.UI/Styling/SliderStyle.cs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public sealed class ScrollViewerLayoutTests`
`15`	`15`	`[TestMethod]`
`16`	`16`	`public void ScrollViewer_Stretches_Content_To_Viewport_When_NoHorizontalScrolling()`
`17`	`17`	`{`
`18`		`- var content = new VStack("Hello");`
	`18`	`+ var content = new VStack("Hello").VerticalAlignment(VerticalAlignment.Stretch);`
`19`	`19`	`var scroll = new ScrollViewer(content);`
`20`	`20`
`21`	`21`	`var root = new DockLayout().Content(scroll);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public sealed class SliderValueTests`
`11`	`11`	`[TestMethod]`
`12`	`12`	`public void Value_Is_Clamped_To_Range()`
`13`	`13`	`{`
`14`		`- var slider = new Slider`
	`14`	`+ var slider = new Slider<int>`
`15`	`15`	`{`
`16`	`16`	`Minimum = 0,`
`17`	`17`	`Maximum = 10,`
`@@ -28,7 +28,7 @@ public void Value_Is_Clamped_To_Range()`
`28`	`28`	`[TestMethod]`
`29`	`29`	`public void Value_Snaps_To_Step()`
`30`	`30`	`{`
`31`		`- var slider = new Slider`
	`31`	`+ var slider = new Slider<int>`
`32`	`32`	`{`
`33`	`33`	`Minimum = 0,`
`34`	`34`	`Maximum = 10,`
`@@ -43,7 +43,7 @@ public void Value_Snaps_To_Step()`
`43`	`43`	`[TestMethod]`
`44`	`44`	`public void Range_Is_Kept_Consistent()`
`45`	`45`	`{`
`46`		`- var slider = new Slider();`
	`46`	`+ var slider = new Slider<int>();`
`47`	`47`	`slider.Maximum = 0;`
`48`	`48`	`slider.Minimum = 5;`
`49`	`49`
`@@ -52,4 +52,3 @@ public void Range_Is_Kept_Consistent()`
`52`	`52`	`Assert.AreEqual(5, slider.Value);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`-`
Original file line number	Diff line number	Diff line change
`@@ -598,15 +598,15 @@ private void OnHorizontalBarValueChanged(object? sender, ScrollValueChangedEvent`
`598`	`598`
`599`	`599`	`private void SetBarValue(ScrollBar bar, int value)`
`600`	`600`	`{`
`601`		`- if (bar.ScrollValue == value)`
	`601`	`+ if (bar.Value == value)`
`602`	`602`	`{`
`603`	`603`	`return;`
`604`	`604`	`}`
`605`	`605`
`606`	`606`	`_syncingOffsets = true;`
`607`	`607`	`try`
`608`	`608`	`{`
`609`		`- bar.ScrollValue = value;`
	`609`	`+ bar.Value = value;`
`610`	`610`	`}`
`611`	`611`	`finally`
`612`	`612`	`{`