aboutsummaryrefslogtreecommitdiff
path: root/source/WindowsFormsApplication1/Apps/Terminal.cs
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2016-07-23 18:47:20 -0700
committerwilliam341 <[email protected]>2016-07-23 18:47:20 -0700
commit024ec56765e91d896d25417ed09ebf2a6f131eee (patch)
tree686aa675c386f95fe7b2e8c03bd45bc7de23a443 /source/WindowsFormsApplication1/Apps/Terminal.cs
parent8c3199c4aad45752e4d2d047d4bfc4d968e43154 (diff)
downloadshiftos-c--024ec56765e91d896d25417ed09ebf2a6f131eee.tar.gz
shiftos-c--024ec56765e91d896d25417ed09ebf2a6f131eee.tar.bz2
shiftos-c--024ec56765e91d896d25417ed09ebf2a6f131eee.zip
Less retarded terminal printing + Fix scrolling
Diffstat (limited to 'source/WindowsFormsApplication1/Apps/Terminal.cs')
-rw-r--r--source/WindowsFormsApplication1/Apps/Terminal.cs20
1 files changed, 9 insertions, 11 deletions
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index f34bdc6..3e156a4 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -70,18 +70,18 @@ namespace ShiftOS
txtterm.Select(txtterm.TextLength, 0);
if (API.Upgrades["terminalscrollbar"] == true)
{
- txtterm.ScrollBars = ScrollBars.Vertical;
+ txtterm.ScrollBars = RichTextBoxScrollBars.Vertical;
}
else
{
- txtterm.ScrollBars = ScrollBars.None;
+ txtterm.ScrollBars = RichTextBoxScrollBars.None;
}
txtterm.MouseWheel += (object s, MouseEventArgs a) =>
{
if (Zooming == true)
{
- txtterm.ScrollBars = ScrollBars.None;
+ txtterm.ScrollBars = RichTextBoxScrollBars.None;
if (ZoomMultiplier > 0)
{
if (a.Delta > 0)
@@ -183,8 +183,7 @@ namespace ShiftOS
// ERROR: Handles clauses are not supported in C#
private void txtterm_Click(object sender, EventArgs e)
{
- txtterm.Select(txtterm.TextLength, 0);
- txtterm.ScrollToCaret();
+ //txtterm.AppendText("");
}
public void SelectBottom()
@@ -457,8 +456,7 @@ namespace ShiftOS
if (SaveSystem.ShiftoriumRegistry.ShiftoriumUpgrades["autoscrollterminal"] == true)
{
- txtterm.Select(txtterm.TextLength, 0);
- txtterm.ScrollToCaret();
+ txtterm.AppendText("");
}
}
@@ -2135,14 +2133,14 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
{
if (txtterm.Text.Length > 0)
{
- txtterm.Text += Environment.NewLine + text;
+ txtterm.AppendText(Environment.NewLine);
+ txtterm.AppendText(text);
}
else
{
txtterm.Text += text;
}
- txtterm.Select(txtterm.TextLength, 0);
- txtterm.ScrollToCaret();
+ txtterm.AppendText("");
}));
}
private bool Zooming = false;
@@ -2194,7 +2192,7 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
{
if (API.Upgrades["terminalscrollbar"] == true)
{
- txtterm.ScrollBars = ScrollBars.Vertical;
+ txtterm.ScrollBars = RichTextBoxScrollBars.Vertical;
}
}
}