mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-28 00:38:00 +01:00
Fixes # 737.Added an auto hide scroll bars to the ScrollView.
This commit is contained in:
@@ -135,6 +135,10 @@ namespace Terminal.Gui {
|
||||
|
||||
Driver.SetAttribute (ColorScheme.Normal);
|
||||
|
||||
if (Bounds.Height == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (vertical) {
|
||||
if (region.Right < Bounds.Width - 1)
|
||||
return;
|
||||
@@ -149,6 +153,10 @@ namespace Terminal.Gui {
|
||||
|
||||
Move (col, 0);
|
||||
Driver.AddRune (Driver.UpArrow);
|
||||
if (Bounds.Height == 3) {
|
||||
Move (col, 1);
|
||||
Driver.AddRune (Driver.Diamond);
|
||||
}
|
||||
Move (col, Bounds.Height - 1);
|
||||
Driver.AddRune (Driver.DownArrow);
|
||||
} else {
|
||||
@@ -393,6 +401,11 @@ namespace Terminal.Gui {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// If true the vertical/horizontal scroll bars won't be showed if it's not needed.
|
||||
/// </summary>
|
||||
public bool AutoHideScrollBars { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Adds the view to the scrollview.
|
||||
/// </summary>
|
||||
@@ -494,17 +507,21 @@ namespace Terminal.Gui {
|
||||
|
||||
var savedClip = ClipToBounds ();
|
||||
OnDrawContent (new Rect (ContentOffset,
|
||||
new Size (Bounds.Width - (ShowVerticalScrollIndicator ? 1 : 0),
|
||||
Bounds.Height - (ShowHorizontalScrollIndicator ? 1 : 0))));
|
||||
new Size (Math.Max (Bounds.Width - (ShowVerticalScrollIndicator ? 1 : 0), 0),
|
||||
Math.Max (Bounds.Height - (ShowHorizontalScrollIndicator ? 1 : 0), 0))));
|
||||
contentView.Redraw (contentView.Frame);
|
||||
Driver.Clip = savedClip;
|
||||
|
||||
if (ShowVerticalScrollIndicator) {
|
||||
vertical.Redraw (vertical.Bounds);
|
||||
}
|
||||
if (AutoHideScrollBars) {
|
||||
ShowHideScrollBars ();
|
||||
} else {
|
||||
if (ShowVerticalScrollIndicator) {
|
||||
vertical.Redraw (vertical.Bounds);
|
||||
}
|
||||
|
||||
if (ShowHorizontalScrollIndicator) {
|
||||
horizontal.Redraw (horizontal.Bounds);
|
||||
if (ShowHorizontalScrollIndicator) {
|
||||
horizontal.Redraw (horizontal.Bounds);
|
||||
}
|
||||
}
|
||||
|
||||
// Fill in the bottom left corner
|
||||
@@ -514,6 +531,46 @@ namespace Terminal.Gui {
|
||||
Driver.SetAttribute (ColorScheme.Normal);
|
||||
}
|
||||
|
||||
void ShowHideScrollBars ()
|
||||
{
|
||||
bool v = false, h = false;
|
||||
|
||||
if (Bounds.Height == 0 || Bounds.Height > contentSize.Height) {
|
||||
if (ShowVerticalScrollIndicator) {
|
||||
ShowVerticalScrollIndicator = false;
|
||||
}
|
||||
v = false;
|
||||
} else {
|
||||
if (!ShowVerticalScrollIndicator) {
|
||||
ShowVerticalScrollIndicator = true;
|
||||
}
|
||||
v = true;
|
||||
}
|
||||
if (Bounds.Width == 0 || Bounds.Width > contentSize.Width) {
|
||||
if (ShowHorizontalScrollIndicator) {
|
||||
ShowHorizontalScrollIndicator = false;
|
||||
}
|
||||
h = false;
|
||||
} else {
|
||||
if (!ShowHorizontalScrollIndicator) {
|
||||
ShowHorizontalScrollIndicator = true;
|
||||
}
|
||||
h = true;
|
||||
}
|
||||
|
||||
vertical.Height = Dim.Fill (h ? 1 : 0);
|
||||
horizontal.Width = Dim.Fill (v ? 1 : 0);
|
||||
|
||||
if (v) {
|
||||
vertical.SetRelativeLayout (Bounds);
|
||||
vertical.Redraw (vertical.Bounds);
|
||||
}
|
||||
if (h) {
|
||||
horizontal.SetRelativeLayout (Bounds);
|
||||
horizontal.Redraw (horizontal.Bounds);
|
||||
}
|
||||
}
|
||||
|
||||
void SetViewsNeedsDisplay ()
|
||||
{
|
||||
foreach (View view in contentView) {
|
||||
@@ -631,13 +688,13 @@ namespace Terminal.Gui {
|
||||
!me.Flags.HasFlag (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition))
|
||||
return false;
|
||||
|
||||
if (me.Flags == MouseFlags.WheeledDown)
|
||||
if (me.Flags == MouseFlags.WheeledDown && ShowVerticalScrollIndicator)
|
||||
ScrollDown (1);
|
||||
else if (me.Flags == MouseFlags.WheeledUp)
|
||||
else if (me.Flags == MouseFlags.WheeledUp && ShowVerticalScrollIndicator)
|
||||
ScrollUp (1);
|
||||
else if (me.X == vertical.Frame.X)
|
||||
else if (me.X == vertical.Frame.X && ShowVerticalScrollIndicator)
|
||||
vertical.MouseEvent (me);
|
||||
else if (me.Y == horizontal.Frame.Y)
|
||||
else if (me.Y == horizontal.Frame.Y && ShowHorizontalScrollIndicator)
|
||||
horizontal.MouseEvent (me);
|
||||
else if (IsOverridden (me.View)) {
|
||||
Application.UngrabMouse ();
|
||||
|
||||
Reference in New Issue
Block a user