Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 10 additions & 76 deletions Examples/UICatalog/Scenarios/Notepad.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ public override void Main ()
_tabView.Style.ShowBorder = true;
_tabView.ApplyStyleChanges ();

// Start with only a single view but support splitting to show side by side
var split = new TileView (1) { X = 0, Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1) };
split.Tiles.ElementAt (0).ContentView.Add (_tabView);
split.LineStyle = LineStyle.None;

top.Add (split);
// Simple container for the tabview
top.Add (_tabView);
_tabView.X = 0;
_tabView.Y = 1;
_tabView.Width = Dim.Fill ();
_tabView.Height = Dim.Fill (1);

LenShortcut = new (Key.Empty, "Len: ", null);

var statusBar = new StatusBar (new [] {
Expand Down Expand Up @@ -198,40 +199,6 @@ private void Close (TabView tv, Tab tabToClose)
tv.RemoveTab (tab);
tab.View.Dispose ();
_focusedTabView = tv;

if (tv.Tabs.Count == 0)
{
var split = (TileView)tv.SuperView.SuperView;

// if it is the last TabView on screen don't drop it or we will
// be unable to open new docs!
if (split.IsRootTileView () && split.Tiles.Count == 1)
{
return;
}

int tileIndex = split.IndexOf (tv);
split.RemoveTile (tileIndex);

if (split.Tiles.Count == 0)
{
TileView parent = split.GetParentTileView ();

if (parent == null)
{
return;
}

int idx = parent.IndexOf (split);

if (idx == -1)
{
return;
}

parent.RemoveTile (idx);
}
}
}

private TabView CreateNewTabView ()
Expand Down Expand Up @@ -286,36 +253,7 @@ private void Open (FileInfo fileInfo, string tabName)

private void Quit () { Application.RequestStop (); }

private void Split (int offset, Orientation orientation, TabView sender, OpenedFile tab)
{
var split = (TileView)sender.SuperView.SuperView;
int tileIndex = split.IndexOf (sender);

if (tileIndex == -1)
{
return;
}

if (orientation != split.Orientation)
{
split.TrySplitTile (tileIndex, 1, out split);
split.Orientation = orientation;
tileIndex = 0;
}

Tile newTile = split.InsertTile (tileIndex + offset);
TabView newTabView = CreateNewTabView ();
tab.CloneTo (newTabView);
newTile.ContentView.Add (newTabView);

newTabView.FocusDeepest (NavigationDirection.Forward, null);
newTabView.AdvanceFocus (NavigationDirection.Forward, null);
}

private void SplitDown (TabView sender, OpenedFile tab) { Split (1, Orientation.Horizontal, sender, tab); }
private void SplitLeft (TabView sender, OpenedFile tab) { Split (0, Orientation.Vertical, sender, tab); }
private void SplitRight (TabView sender, OpenedFile tab) { Split (1, Orientation.Vertical, sender, tab); }
private void SplitUp (TabView sender, OpenedFile tab) { Split (0, Orientation.Horizontal, sender, tab); }
// Split functionality removed - TileView is deprecated in favor of View.Arrangement

private void TabView_SelectedTabChanged (object sender, TabChangedEventArgs e)
{
Expand Down Expand Up @@ -346,12 +284,8 @@ private void TabView_TabClicked (object sender, TabMouseEventArgs e)
items =
[
new MenuItemv2 ("Save", "", () => Save (_focusedTabView, e.Tab)),
new MenuItemv2 ("Close", "", () => Close (tv, e.Tab)),
new Line (),
new MenuItemv2 ("Split Up", "", () => SplitUp (tv, t)),
new MenuItemv2 ("Split Down", "", () => SplitDown (tv, t)),
new MenuItemv2 ("Split Right", "", () => SplitRight (tv, t)),
new MenuItemv2 ("Split Left", "", () => SplitLeft (tv, t))
new MenuItemv2 ("Close", "", () => Close (tv, e.Tab))
// Split menu items removed - TileView is deprecated in favor of View.Arrangement
];

PopoverMenu? contextMenu = new (items);
Expand Down
228 changes: 0 additions & 228 deletions Examples/UICatalog/Scenarios/TileViewNesting.cs

This file was deleted.

2 changes: 1 addition & 1 deletion Terminal.Gui/ViewBase/View.Hierarchy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ protected virtual void OnSuperViewChanged (SuperViewChangedEventArgs e) { }
Logging.Warning ($"{view} has already been Added to {this}.");
}

// TileView likes to add views that were previously added and have HasFocus = true. No bueno.
// Ensure views that were previously added don't have HasFocus = true when re-added
view.HasFocus = false;

// TODO: Make this thread safe
Expand Down
Loading
Loading