Skip to content

Commit e81e57c

Browse files
committed
Remove unneeded members
1 parent 994bf55 commit e81e57c

File tree

6 files changed

+7
-56
lines changed

6 files changed

+7
-56
lines changed

Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public void ClearContents ()
452452
/// Sets <see cref="Contents"/> as dirty for situations where views
453453
/// don't need layout and redrawing, but just refresh the screen.
454454
/// </summary>
455-
public void SetContentsAsDirty ()
455+
protected void SetContentsAsDirty ()
456456
{
457457
lock (Contents!)
458458
{
@@ -480,10 +480,6 @@ public void SetContentsAsDirty ()
480480

481481
#region Cursor Handling
482482

483-
/// <summary>Determines if the terminal cursor should be visible or not and sets it accordingly.</summary>
484-
/// <returns><see langword="true"/> upon success</returns>
485-
public abstract bool EnsureCursorVisibility ();
486-
487483
/// <summary>Gets the terminal cursor visibility.</summary>
488484
/// <param name="visibility">The current <see cref="CursorVisibility"/></param>
489485
/// <returns><see langword="true"/> upon success</returns>

Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,21 +507,19 @@ private static ColorName16 CursesColorNumberToColorName16 (short color)
507507
private CursorVisibility? _currentCursorVisibility;
508508
private CursorVisibility? _initialCursorVisibility;
509509

510-
/// <inheritdoc/>
511-
public override bool EnsureCursorVisibility ()
510+
511+
private void EnsureCursorVisibility ()
512512
{
513513
if (!(Col >= 0 && Row >= 0 && Col < Cols && Row < Rows))
514514
{
515515
GetCursorVisibility (out CursorVisibility cursorVisibility);
516516
_currentCursorVisibility = cursorVisibility;
517517
SetCursorVisibility (CursorVisibility.Invisible);
518518

519-
return false;
519+
return;
520520
}
521521

522522
SetCursorVisibility (_currentCursorVisibility ?? CursorVisibility.Default);
523-
524-
return _currentCursorVisibility == CursorVisibility.Default;
525523
}
526524

527525
/// <inheritdoc/>

Terminal.Gui/ConsoleDrivers/FakeDriver/FakeDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
377377
}
378378

379379
/// <inheritdoc/>
380-
public override bool EnsureCursorVisibility ()
380+
private bool EnsureCursorVisibility ()
381381
{
382382
if (!(Col >= 0 && Row >= 0 && Col < Cols && Row < Rows))
383383
{

Terminal.Gui/ConsoleDrivers/IConsoleDriver.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,6 @@ public interface IConsoleDriver
200200
/// </summary>
201201
event EventHandler<EventArgs>? ClearedContents;
202202

203-
// BUGBUG: This is not referenced. Can it be removed?
204-
/// <summary>
205-
/// Sets <see cref="ConsoleDriver.Contents"/> as dirty for situations where views
206-
/// don't need layout and redrawing, but just refresh the screen.
207-
/// </summary>
208-
void SetContentsAsDirty ();
209-
210-
// BUGBUG: This is not referenced. Can it be removed?
211-
/// <summary>Determines if the terminal cursor should be visible or not and sets it accordingly.</summary>
212-
/// <returns><see langword="true"/> upon success</returns>
213-
bool EnsureCursorVisibility ();
214-
215203
/// <summary>Gets the terminal cursor visibility.</summary>
216204
/// <param name="visibility">The current <see cref="CursorVisibility"/></param>
217205
/// <returns><see langword="true"/> upon success</returns>

Terminal.Gui/ConsoleDrivers/NetDriver/NetDriver.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -496,20 +496,18 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
496496
return visibility == CursorVisibility.Default;
497497
}
498498

499-
public override bool EnsureCursorVisibility ()
499+
private void EnsureCursorVisibility ()
500500
{
501501
if (!(Col >= 0 && Row >= 0 && Col < Cols && Row < Rows))
502502
{
503503
GetCursorVisibility (out CursorVisibility cursorVisibility);
504504
_cachedCursorVisibility = cursorVisibility;
505505
SetCursorVisibility (CursorVisibility.Invisible);
506506

507-
return false;
507+
return;
508508
}
509509

510510
SetCursorVisibility (_cachedCursorVisibility ?? CursorVisibility.Default);
511-
512-
return _cachedCursorVisibility == CursorVisibility.Default;
513511
}
514512

515513
#endregion

Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsDriver.cs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -293,35 +293,6 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
293293
return WinConsole?.WriteANSI (sb.ToString ()) ?? false;
294294
}
295295
}
296-
297-
/// <inheritdoc/>
298-
public override bool EnsureCursorVisibility ()
299-
{
300-
if (Force16Colors)
301-
{
302-
return WinConsole is null || WinConsole.EnsureCursorVisibility ();
303-
}
304-
else
305-
{
306-
var sb = new StringBuilder ();
307-
sb.Append (_cachedCursorVisibility != CursorVisibility.Invisible ? EscSeqUtils.CSI_ShowCursor : EscSeqUtils.CSI_HideCursor);
308-
return WinConsole?.WriteANSI (sb.ToString ()) ?? false;
309-
}
310-
311-
//if (!(Col >= 0 && Row >= 0 && Col < Cols && Row < Rows))
312-
//{
313-
// GetCursorVisibility (out CursorVisibility cursorVisibility);
314-
// _cachedCursorVisibility = cursorVisibility;
315-
// SetCursorVisibility (CursorVisibility.Invisible);
316-
317-
// return false;
318-
//}
319-
320-
//SetCursorVisibility (_cachedCursorVisibility ?? CursorVisibility.Default);
321-
322-
//return _cachedCursorVisibility == CursorVisibility.Default;
323-
}
324-
325296
#endregion Cursor Handling
326297

327298
public override bool UpdateScreen ()

0 commit comments

Comments
 (0)