aboutsummaryrefslogtreecommitdiff
path: root/source/WindowsFormsApplication1/Apps
diff options
context:
space:
mode:
Diffstat (limited to 'source/WindowsFormsApplication1/Apps')
-rw-r--r--source/WindowsFormsApplication1/Apps/Terminal.Designer.cs4
-rw-r--r--source/WindowsFormsApplication1/Apps/Terminal.cs20
2 files changed, 11 insertions, 13 deletions
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs b/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
index de4e913..350bcfd 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.Designer.cs
@@ -31,7 +31,7 @@ namespace ShiftOS
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.txtterm = new ShiftUI.TextBox();
+ this.txtterm = new ShiftUI.RichTextBox();
this.tmrfirstrun = new ShiftUI.Timer(this.components);
this.tmrshutdown = new ShiftUI.Timer(this.components);
this.pullbs = new ShiftUI.Timer(this.components);
@@ -111,7 +111,7 @@ namespace ShiftOS
this.ResumeLayout(false);
}
- internal ShiftUI.TextBox txtterm;
+ internal ShiftUI.RichTextBox txtterm;
internal ShiftUI.Timer tmrfirstrun;
internal ShiftUI.Timer tmrshutdown;
internal ShiftUI.Timer pullbs;
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;
}
}
}