Fixes #2493. Move all layout code out of View (and Toplevel) into a layout helper class (#2544)

* Comment/warning clean up

* Moved Text and Drawing out

* Moved Layout out

* Removed extra lines

* Removed Mouse out

* Reorgainzed View

* API docs

* removed border.cs

* TopLevel.Resized -> TerminalResized

* Mdi -> Overlapped

* Removed confusing and un-needed WillPresent

* privates -> _

* Tweaked RunLoop API
This commit is contained in:
Tig
2023-04-14 10:26:10 -06:00
committed by GitHub
parent 8c59e8255f
commit b4552ee14b
154 changed files with 5261 additions and 5725 deletions

View File

@@ -35,7 +35,6 @@ namespace UICatalog.Scenarios {
()=>MultiBarGraph() //7
};
var menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("Scatter _Plot", "",()=>graphs[currentGraph = 0]()),
@@ -67,10 +66,8 @@ namespace UICatalog.Scenarios {
Height = 20,
};
Win.Add (graphView);
var frameRight = new FrameView ("About") {
X = Pos.Right (graphView) + 1,
Y = 0,
@@ -78,7 +75,6 @@ namespace UICatalog.Scenarios {
Height = Dim.Fill (),
};
frameRight.Add (about = new TextView () {
Width = Dim.Fill (),
Height = Dim.Fill ()
@@ -86,7 +82,6 @@ namespace UICatalog.Scenarios {
Win.Add (frameRight);
var statusBar = new StatusBar (new StatusItem [] {
new StatusItem(Application.QuitKey, $"{Application.QuitKey} to Quit", () => Quit()),
new StatusItem(Key.CtrlMask | Key.G, "~^G~ Next", ()=>graphs[currentGraph++%graphs.Length]()),
@@ -135,7 +130,6 @@ namespace UICatalog.Scenarios {
graphView.AxisX.ShowLabelsEvery = 0;
graphView.AxisX.Minimum = 0;
graphView.AxisY.Minimum = 0;
var legend = new LegendAnnotation (new Rect (graphView.Bounds.Width - 20, 0, 20, 5));
@@ -179,14 +173,12 @@ namespace UICatalog.Scenarios {
graphView.Series.Add (points);
graphView.Annotations.Add (line);
randomPoints = new List<PointF> ();
for (int i = 0; i < 10; i++) {
randomPoints.Add (new PointF (r.Next (100), r.Next (100)));
}
var points2 = new ScatterSeries () {
Points = randomPoints,
Fill = new GraphCellToRender ('x', red)
@@ -471,7 +463,6 @@ namespace UICatalog.Scenarios {
};
graphView.Series.Add (malesSeries);
// Females
var femalesSeries = new BarSeries () {
Orientation = Orientation.Horizontal,
@@ -501,7 +492,6 @@ namespace UICatalog.Scenarios {
}
};
var softStiple = new GraphCellToRender ('\u2591');
var mediumStiple = new GraphCellToRender ('\u2592');
@@ -587,7 +577,6 @@ namespace UICatalog.Scenarios {
}
graphView.SetNeedsDisplay ();
// while the equaliser is showing
return graphView.Series.Contains (series);
};