Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-29 17:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

merging tigs

Browse Source
This commit is contained in:
Tig Kindel
2023-02-09 05:24:08 -08:00
parent 040bbc41cb
commit cd20deef87
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
UICatalog/Scenarios/TileViewNesting.cs
View File

@@ -104,19 +104,19 @@ namespace UICatalog.Scenarios {
Terminal.Gui.Graphs.Orientation.Horizontal :
Terminal.Gui.Graphs.Orientation.Vertical);
root.Tiles.ElementAt(0).View.Add (CreateContentControl (1));
root.Tiles.ElementAt(0).ContentView.Add (CreateContentControl (1));
root.Tiles.ElementAt(0).Title = cbTitles.Checked ? $"View 1" : string.Empty;
root.Tiles.ElementAt (1).View.Add (CreateContentControl (2));
root.Tiles.ElementAt (1).ContentView.Add (CreateContentControl (2));
root.Tiles.ElementAt(1).Title = cbTitles.Checked ? $"View 2" : string.Empty;
root.IntegratedBorder = border ? BorderStyle.Rounded : BorderStyle.None;
root.Border.BorderStyle = border ? BorderStyle.Rounded : BorderStyle.None;
workArea.Add (root);
if (numberOfViews == 1) {
root.Tiles.ElementAt (1).View.Visible = false;
root.Tiles.ElementAt (1).ContentView.Visible = false;
}
if (numberOfViews > 2) {
@@ -164,18 +164,18 @@ namespace UICatalog.Scenarios {
if (viewsCreated == viewsToCreate) {
return;
}
if (!(to.Tiles.ElementAt(0).View is TileView)) {
if (!(to.Tiles.ElementAt(0).ContentView is TileView)) {
Split(to,true);
}
if (!(to.Tiles.ElementAt (1).View is TileView)) {
if (!(to.Tiles.ElementAt (1).ContentView is TileView)) {
Split(to,false);
}
if (to.Tiles.ElementAt (0).View is TileView && to.Tiles.ElementAt (1).View is TileView) {
if (to.Tiles.ElementAt (0).ContentView is TileView && to.Tiles.ElementAt (1).ContentView is TileView) {
AddMoreViews ((TileView)to.Tiles.ElementAt (0).View);
AddMoreViews ((TileView)to.Tiles.ElementAt (1).View);
AddMoreViews ((TileView)to.Tiles.ElementAt (0).ContentView);
AddMoreViews ((TileView)to.Tiles.ElementAt (1).ContentView);
}
}
@@ -207,7 +207,7 @@ namespace UICatalog.Scenarios {
Orientation.Horizontal :
Orientation.Vertical;
newView.Tiles.ElementAt (1).View.Add (CreateContentControl(viewsCreated));
newView.Tiles.ElementAt (1).ContentView.Add (CreateContentControl(viewsCreated));
}
private TileView CreateTileView (int titleNumber, Orientation orientation)