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

Merge branch 'master' into idisposable

Browse Source
This commit is contained in:
Charlie Kindel
2020-07-02 08:20:14 -07:00
parent 9606dad68c a557252196
commit bb30b5d54e
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Terminal.Gui/Views/ScrollView.cs
View File

@@ -152,13 +152,19 @@ namespace Terminal.Gui {
var by2 = (position + bh) * bh / Size;
Move (col, 0);
Driver.AddRune (Driver.UpArrow);
if (Bounds.Height == 1) {
Driver.AddRune (Driver.Diamond);
} else {
Driver.AddRune (Driver.UpArrow);
}
if (Bounds.Height == 3) {
Move (col, 1);
Driver.AddRune (Driver.Diamond);
}
Move (col, Bounds.Height - 1);
Driver.AddRune (Driver.DownArrow);
if (Bounds.Height > 1) {
Move (col, Bounds.Height - 1);
Driver.AddRune (Driver.DownArrow);
}
} else {
bh -= 2;
var by1 = position * bh / Size;
@@ -533,13 +539,15 @@ namespace Terminal.Gui {
void ShowHideScrollBars ()
{
bool v = false, h = false;
bool v = false, h = false; bool p = false;
if (Bounds.Height == 0 || Bounds.Height > contentSize.Height) {
if (ShowVerticalScrollIndicator) {
ShowVerticalScrollIndicator = false;
}
v = false;
} else if (Bounds.Height > 0 && Bounds.Height == contentSize.Height) {
p = true;
} else {
if (!ShowVerticalScrollIndicator) {
ShowVerticalScrollIndicator = true;
@@ -551,7 +559,22 @@ namespace Terminal.Gui {
ShowHorizontalScrollIndicator = false;
}
h = false;
} else if (Bounds.Width > 0 && Bounds.Width == contentSize.Width && p) {
if (ShowHorizontalScrollIndicator) {
ShowHorizontalScrollIndicator = false;
}
h = false;
if (ShowVerticalScrollIndicator) {
ShowVerticalScrollIndicator = false;
}
v = false;
} else {
if (p) {
if (!ShowVerticalScrollIndicator) {
ShowVerticalScrollIndicator = true;
}
v = true;
}
if (!ShowHorizontalScrollIndicator) {
ShowHorizontalScrollIndicator = true;
}