mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-02 01:03:29 +01:00
Merge branch 'develop' into fixes_520_toplevels_not_cleanedup
This commit is contained in:
@@ -240,7 +240,13 @@ namespace Terminal.Gui {
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc/>
|
||||
/// <remarks>Also ensures that cursor is invisible after entering the <see cref="GraphView"/>.</remarks>
|
||||
public override bool OnEnter (View view)
|
||||
{
|
||||
Driver.SetCursorVisibility (CursorVisibility.Invisible);
|
||||
return base.OnEnter (view);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override bool ProcessKey (KeyEvent keyEvent)
|
||||
|
||||
@@ -466,31 +466,10 @@ namespace Terminal.Gui {
|
||||
Width = Dim.Fill ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Positions the cursor at the start of the currently selected tab
|
||||
/// </summary>
|
||||
public override void PositionCursor ()
|
||||
public override bool OnEnter (View view)
|
||||
{
|
||||
base.PositionCursor ();
|
||||
|
||||
var selected = host.CalculateViewport (Bounds).FirstOrDefault (t => Equals (host.SelectedTab, t.Tab));
|
||||
|
||||
if (selected == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
int y;
|
||||
|
||||
if (host.Style.TabsOnBottom) {
|
||||
y = 1;
|
||||
} else {
|
||||
y = host.Style.ShowTopLine ? 1 : 0;
|
||||
}
|
||||
|
||||
Move (selected.X, y);
|
||||
|
||||
|
||||
|
||||
Driver.SetCursorVisibility (CursorVisibility.Invisible);
|
||||
return base.OnEnter (view);
|
||||
}
|
||||
|
||||
public override void Redraw (Rect bounds)
|
||||
|
||||
Reference in New Issue
Block a user