tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-07-04 11:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix resizing of Live views with reduced size. (#1840)

Browse Source
This commit is contained in:
Daniel
2025-06-21 12:30:18 +02:00
committed by GitHub
parent 7f3ebe02c4
commit f32f80dc57
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Spectre.Console/Live/LiveDisplayRenderer.cs
View File

@ -4,7 +4,6 @@ internal sealed class LiveDisplayRenderer : IRenderHook
{ {
private readonly IAnsiConsole _console; private readonly IAnsiConsole _console;
private readonly LiveDisplayContext _context; private readonly LiveDisplayContext _context;
public LiveDisplayRenderer(IAnsiConsole console, LiveDisplayContext context) public LiveDisplayRenderer(IAnsiConsole console, LiveDisplayContext context)
{ {
_console = console; _console = console;
@ -45,7 +44,7 @@ internal sealed class LiveDisplayRenderer : IRenderHook
{ {
lock (_context.Lock) lock (_context.Lock)
{ {
yield return _context.Live.PositionCursor(); yield return _context.Live.PositionCursor(options);
foreach (var renderable in renderables) foreach (var renderable in renderables)
{ {

10
src/Spectre.Console/Live/LiveRenderable.cs
View File

@ -39,7 +39,7 @@ internal sealed class LiveRenderable : Renderable
} }
} }
public IRenderable PositionCursor() public IRenderable PositionCursor(RenderOptions options)
{ {
lock (_lock) lock (_lock)
{ {
@ -48,6 +48,14 @@ internal sealed class LiveRenderable : Renderable
return new ControlCode(string.Empty); return new ControlCode(string.Empty);
} }
// Check if the size have been reduced
if (_shape.Value.Height > options.ConsoleSize.Height || _shape.Value.Width > options.ConsoleSize.Width)
{
// Important reset shape, so the size can shrink
_shape = null;
return new ControlCode(ED(2) + ED(3) + CUP(1, 1));
}
var linesToMoveUp = _shape.Value.Height - 1; var linesToMoveUp = _shape.Value.Height - 1;
return new ControlCode("\r" + CUU(linesToMoveUp)); return new ControlCode("\r" + CUU(linesToMoveUp));
} }

2
src/Spectre.Console/Live/Progress/Renderers/DefaultProgressRenderer.cs
View File

@ -118,7 +118,7 @@ internal sealed class DefaultProgressRenderer : ProgressRenderer
{ {
lock (_lock) lock (_lock)
{ {
yield return _live.PositionCursor(); yield return _live.PositionCursor(options);
foreach (var renderable in renderables) foreach (var renderable in renderables)
{ {

2
src/Spectre.Console/Prompts/List/ListPromptRenderHook.cs
View File

@ -42,7 +42,7 @@ internal sealed class ListPromptRenderHook<T> : IRenderHook
_dirty = false; _dirty = false;
} }
yield return _live.PositionCursor(); yield return _live.PositionCursor(options);
foreach (var renderable in renderables) foreach (var renderable in renderables)
{ {