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

Cleaned up AdornmentsEditor to fix Progress Styles scenario.

Browse Source 
Fixed GetFocusColor to not show focus if nothing else can be foucused
This commit is contained in:
Tig
2024-04-14 23:47:57 -06:00
parent 012e7a376a
commit 92e7bc67ce
6 changed files with 117 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Terminal.Gui/View/ViewDrawing.cs
View File

@@ -329,13 +329,17 @@ public partial class View
public virtual Attribute GetFocusColor ()
{
ColorScheme cs = ColorScheme;
if (ColorScheme is null)
{
cs = new ();
}
return Enabled ? cs.Focus : cs.Disabled;
if (SuperView is {} && SuperView?.Subviews!.Count(s => s.CanFocus) > 1)
{
return Enabled ? cs.Focus : cs.Disabled;
}
return Enabled ? cs.Normal : cs.Disabled;
}
/// <summary>Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.</summary>

4
Terminal.Gui/Views/Toplevel.cs
View File

@@ -380,7 +380,7 @@ public partial class Toplevel : View
/// <param name="top">The Toplevel to adjust.</param>
public virtual void PositionToplevel (Toplevel top)
{
View superView = GetLocationEnsuringFullVisibility (
top,
top.Frame.X,
@@ -548,7 +548,7 @@ public partial class Toplevel : View
/// to dispose objects after calling <see cref="Application.End(RunState)"/>.
/// </summary>
public event EventHandler Unloaded;
internal void AddMenuStatusBar (View view)
{
if (view is MenuBar)

66
UICatalog/Scenarios/Adornments.cs
View File

@@ -19,7 +19,23 @@ public class Adornments : Scenario
_diagnosticFlags = View.Diagnostics;
var view = new Window { Title = "The _Window" };
Window app = new ()
{
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
};
var editor = new AdornmentsEditor ();
app.Add (editor);
var window = new Window
{
Title = "The _Window",
X = Pos.Right(editor),
Width = Dim.Percent (60),
Height = Dim.Percent (80),
};
app.Add (window);
var tf1 = new TextField { Width = 10, Text = "TextField" };
var color = new ColorPicker { Title = "BG", BoxHeight = 1, BoxWidth = 1, X = Pos.AnchorEnd (11) };
color.BorderStyle = LineStyle.RoundedDotted;
@@ -38,7 +54,7 @@ public class Adornments : Scenario
var button = new Button { X = Pos.Center (), Y = Pos.Center (), Text = "Press me!" };
button.Accept += (s, e) =>
MessageBox.Query (20, 7, "Hi", $"Am I a {view.GetType ().Name}?", "Yes", "No");
MessageBox.Query (20, 7, "Hi", $"Am I a {window.GetType ().Name}?", "Yes", "No");
var label = new TextView
{
@@ -62,14 +78,14 @@ public class Adornments : Scenario
Text = "Label\nY=AnchorEnd(3),Height=Dim.Fill()"
};
view.Margin.Data = "Margin";
view.Margin.Thickness = new (3);
window.Margin.Data = "Margin";
window.Margin.Thickness = new (3);
view.Border.Data = "Border";
view.Border.Thickness = new (3);
window.Border.Data = "Border";
window.Border.Thickness = new (3);
view.Padding.Data = "Padding";
view.Padding.Thickness = new (3);
window.Padding.Data = "Padding";
window.Padding.Thickness = new (3);
var longLabel = new Label ()
{
@@ -77,31 +93,24 @@ public class Adornments : Scenario
};
longLabel.TextFormatter.WordWrap = true;
view.Add (tf1, color, button, label, btnButtonInWindow, tv, longLabel);
window.Add (tf1, color, button, label, btnButtonInWindow, tv, longLabel);
var editor = new AdornmentsEditor
{
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
};
view.Width = Dim.Percent (60);
view.Height = Dim.Percent (80);
editor.Initialized += (s, e) => { editor.ViewToEdit = window; };
editor.Initialized += (s, e) => { editor.ViewToEdit = view; };
view.Initialized += (s, e) =>
window.Initialized += (s, e) =>
{
var labelInPadding = new Label () { X = 1, Y = 0, Title = "_Text:" };
view.Padding.Add (labelInPadding);
window.Padding.Add (labelInPadding);
var textFieldInPadding = new TextField () { X = Pos.Right (labelInPadding) + 1, Y = Pos.Top (labelInPadding), Width = 15, Text = "some text" };
textFieldInPadding.Accept += (s, e) => MessageBox.Query (20, 7, "TextField", textFieldInPadding.Text, "Ok");
view.Padding.Add (textFieldInPadding);
window.Padding.Add (textFieldInPadding);
var btnButtonInPadding = new Button { X = Pos.Center (), Y = 0, Text = "_Button in Padding" };
btnButtonInPadding.Accept += (s, e) => MessageBox.Query (20, 7, "Hi", "Button in Padding Pressed!", "Ok");
btnButtonInPadding.BorderStyle = LineStyle.Dashed;
btnButtonInPadding.Border.Thickness = new (1, 1, 1, 1);
view.Padding.Add (btnButtonInPadding);
window.Padding.Add (btnButtonInPadding);
#if SUBVIEW_BASED_BORDER
btnButtonInPadding.Border.CloseButton.Visible = true;
@@ -117,10 +126,10 @@ public class Adornments : Scenario
#endif
};
editor.Closed += (s, e) => View.Diagnostics = _diagnosticFlags;
app.Closed += (s, e) => View.Diagnostics = _diagnosticFlags;
Application.Run (editor);
editor.Dispose ();
Application.Run (app);
app.Dispose ();
Application.Shutdown ();
}
@@ -329,7 +338,7 @@ public class Adornments : Scenario
/// <summary>
/// Provides an editor UI for the Margin, Border, and Padding of a View.
/// </summary>
public class AdornmentsEditor : Window
public class AdornmentsEditor : View
{
private AdornmentEditor _borderEditor;
private CheckBox _diagCheckBox;
@@ -341,6 +350,10 @@ public class Adornments : Scenario
public AdornmentsEditor ()
{
ColorScheme = Colors.ColorSchemes ["Dialog"];
// TOOD: Use Dim.Auto
Width = 36;
Height = Dim.Fill ();
}
public View ViewToEdit
@@ -473,9 +486,6 @@ public class Adornments : Scenario
};
Add (_diagCheckBox);
_viewToEdit.X = Pos.Right (rbBorderStyle);
_viewToEdit.Y = 0;
Add (_viewToEdit);
_viewToEdit.LayoutComplete += (s, e) =>
{

30
UICatalog/Scenarios/ContentScrolling.cs
View File

@@ -2,6 +2,7 @@
using System.ComponentModel;
using System.Linq;
using Terminal.Gui;
using static UICatalog.Scenarios.Adornments;
namespace UICatalog.Scenarios;
@@ -100,7 +101,22 @@ public class ContentScrolling : Scenario
_diagnosticFlags = View.Diagnostics;
var view = new ScrollingDemoView { Title = "Demo View" };
Window app = new ()
{
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
};
var editor = new AdornmentsEditor ();
app.Add (editor);
var view = new ScrollingDemoView
{
Title = "Demo View",
X = Pos.Right(editor),
Width = Dim.Fill (),
Height = Dim.Fill ()
};
app.Add (view);
// Add Scroll Setting UI to Padding
view.Padding.Thickness = new (0, 3, 0, 0);
@@ -375,18 +391,12 @@ public class ContentScrolling : Scenario
longLabel.TextFormatter.WordWrap = true;
view.Add (longLabel);
var editor = new Adornments.AdornmentsEditor
{
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
ColorScheme = Colors.ColorSchemes ["Dialog"]
};
editor.Initialized += (s, e) => { editor.ViewToEdit = view; };
editor.Closed += (s, e) => View.Diagnostics = _diagnosticFlags;
app.Closed += (s, e) => View.Diagnostics = _diagnosticFlags;
Application.Run (editor);
editor.Dispose ();
Application.Run (app);
app.Dispose ();
Application.Shutdown ();
}
}

92
UICatalog/Scenarios/ProgressBarStyles.cs
View File

@@ -20,20 +20,30 @@ public class ProgressBarStyles : Scenario
private const uint _timerTick = 20;
private Timer _fractionTimer;
private Timer _pulseTimer;
private ViewDiagnosticFlags _diagnosticFlags;
public override void Init ()
public override void Main ()
{
Application.Init ();
ConfigurationManager.Themes.Theme = Theme;
ConfigurationManager.Apply ();
Top = new ();
_diagnosticFlags = View.Diagnostics;
var editor = new AdornmentsEditor
Window app = new ()
{
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}", BorderStyle = LineStyle.Single
Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}", BorderStyle = LineStyle.Single,
};
editor.ColorScheme = Colors.ColorSchemes [TopLevelColorScheme];
var editor = new AdornmentsEditor ();
app.Add (editor);
View container = new ()
{
X = Pos.Right (editor),
Y = 0,
Width = Dim.Fill (),
Height = Dim.Fill (),
};
app.Add (container);
const float fractionStep = 0.01F;
@@ -47,16 +57,7 @@ public class ProgressBarStyles : Scenario
BorderStyle = LineStyle.Single
};
pbList.SelectedItemChanged += (sender, e) =>
{
editor.ViewToEdit = editor.Subviews.First (
v =>
v.GetType () == typeof (ProgressBar)
&& v.Title == (string)e.Value
);
};
editor.Add (pbList);
pbList.SelectedItem = 0;
container.Add (pbList);
#region ColorPicker
@@ -80,7 +81,7 @@ public class ProgressBarStyles : Scenario
Width = colorPicker.Frame.Width,
Height = colorPicker.Frame.Height
};
Application.Top.LayoutSubviews();
Application.Top.LayoutSubviews ();
};
dialog.Add (colorPicker);
@@ -98,7 +99,7 @@ public class ProgressBarStyles : Scenario
{
Text = "Foreground HotNormal Color", X = Pos.Center (), Y = Pos.Bottom (pbList)
};
editor.Add (fgColorPickerBtn);
container.Add (fgColorPickerBtn);
fgColorPickerBtn.Accept += (s, e) =>
{
@@ -123,7 +124,7 @@ public class ProgressBarStyles : Scenario
{
X = Pos.Center (), Y = Pos.Bottom (fgColorPickerBtn), Text = "Background HotNormal Color"
};
editor.Add (bgColorPickerBtn);
container.Add (bgColorPickerBtn);
bgColorPickerBtn.Accept += (s, e) =>
{
@@ -157,11 +158,10 @@ public class ProgressBarStyles : Scenario
Y = Pos.Bottom (bgColorPickerBtn) + 1,
RadioLabels = pbFormatEnum.Select (e => e.ToString ()).ToArray ()
};
editor.Add (rbPBFormat);
container.Add (rbPBFormat);
var button = new Button { X = Pos.Center (), Y = Pos.Bottom (rbPBFormat) + 1, Text = "Start timer" };
editor.Add (button);
container.Add (button);
var blocksPB = new ProgressBar
{
@@ -172,7 +172,7 @@ public class ProgressBarStyles : Scenario
BorderStyle = LineStyle.Single,
CanFocus = true
};
editor.Add (blocksPB);
container.Add (blocksPB);
var continuousPB = new ProgressBar
{
@@ -184,7 +184,7 @@ public class ProgressBarStyles : Scenario
BorderStyle = LineStyle.Single,
CanFocus = true
};
editor.Add (continuousPB);
container.Add (continuousPB);
button.Accept += (s, e) =>
{
@@ -222,7 +222,7 @@ public class ProgressBarStyles : Scenario
{
X = Pos.Center (), Y = Pos.Bottom (continuousPB) + 1, Text = "BidirectionalMarquee", Checked = true
};
editor.Add (ckbBidirectional);
container.Add (ckbBidirectional);
var marqueesBlocksPB = new ProgressBar
{
@@ -234,7 +234,7 @@ public class ProgressBarStyles : Scenario
BorderStyle = LineStyle.Single,
CanFocus = true
};
editor.Add (marqueesBlocksPB);
container.Add (marqueesBlocksPB);
var marqueesContinuousPB = new ProgressBar
{
@@ -246,13 +246,22 @@ public class ProgressBarStyles : Scenario
BorderStyle = LineStyle.Single,
CanFocus = true
};
editor.Add (marqueesContinuousPB);
container.Add (marqueesContinuousPB);
pbList.SetSource (
editor.Subviews.Where (v => v.GetType () == typeof (ProgressBar))
.Select (v => v.Title)
.ToList ()
container.Subviews.Where (v => v.GetType () == typeof (ProgressBar))
.Select (v => v.Title)
.ToList ()
);
pbList.SelectedItemChanged += (sender, e) =>
{
editor.ViewToEdit = container.Subviews.First (
v =>
v.GetType () == typeof (ProgressBar)
&& v.Title == (string)e.Value
);
};
pbList.SelectedItem = 0;
rbPBFormat.SelectedItemChanged += (s, e) =>
@@ -272,8 +281,7 @@ public class ProgressBarStyles : Scenario
_pulseTimer = new Timer (
_ =>
{
marqueesBlocksPB.Text =
marqueesContinuousPB.Text = DateTime.Now.TimeOfDay.ToString ();
marqueesBlocksPB.Text = marqueesContinuousPB.Text = DateTime.Now.TimeOfDay.ToString ();
marqueesBlocksPB.Pulse ();
marqueesContinuousPB.Pulse ();
Application.Wakeup ();
@@ -283,9 +291,15 @@ public class ProgressBarStyles : Scenario
300
);
Top.Unloaded += Top_Unloaded;
app.Unloaded += App_Unloaded;
void Top_Unloaded (object sender, EventArgs args)
Application.Run (app);
app.Dispose ();
Application.Shutdown ();
return;
void App_Unloaded (object sender, EventArgs args)
{
if (_fractionTimer != null)
{
@@ -299,13 +313,7 @@ public class ProgressBarStyles : Scenario
_pulseTimer = null;
}
Top.Unloaded -= Top_Unloaded;
app.Unloaded -= App_Unloaded;
}
Application.Run (editor);
editor.Dispose ();
Application.Shutdown ();
}
public override void Run () { }
}

1
UICatalog/UICatalog.cs
View File

@@ -345,6 +345,7 @@ internal class UICatalogApp
// 'app' closed cleanly.
foreach (Responder? inst in Responder.Instances)
{
Debug.Assert (inst.WasDisposed);
}