From 024ec56765e91d896d25417ed09ebf2a6f131eee Mon Sep 17 00:00:00 2001
From: william341 <wwokwilliam@gmail.com>
Date: Sat, 23 Jul 2016 18:47:20 -0700
Subject: Less retarded terminal printing + Fix scrolling

---
 .../Apps/Terminal.Designer.cs                        |  4 ++--
 source/WindowsFormsApplication1/Apps/Terminal.cs     | 20 +++++++++-----------
 .../Controls/WindowBorder.Designer.cs                |  2 +-
 .../Controls/WindowBorder.cs                         |  3 ++-
 4 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'source/WindowsFormsApplication1')

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;
                 }
             }
         }
diff --git a/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
index 01161eb..373210a 100644
--- a/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
+++ b/source/WindowsFormsApplication1/Controls/WindowBorder.Designer.cs
@@ -93,7 +93,7 @@ namespace ShiftOS
             // 
             this.pgbottomrcorner.BackColor = System.Drawing.Color.Red;
             this.pgbottomrcorner.Dock = ShiftUI.DockStyle.Bottom;
-            this.pgbottomrcorner.Location = new System.Drawing.Point(0, 343);
+            this.pgbottomrcorner.Location = new System.Drawing.Point(363, 343);
             this.pgbottomrcorner.Name = "pgbottomrcorner";
             this.pgbottomrcorner.Size = new System.Drawing.Size(2, 2);
             this.pgbottomrcorner.TabIndex = 15;
diff --git a/source/WindowsFormsApplication1/Controls/WindowBorder.cs b/source/WindowsFormsApplication1/Controls/WindowBorder.cs
index fec7eea..d6484aa 100644
--- a/source/WindowsFormsApplication1/Controls/WindowBorder.cs
+++ b/source/WindowsFormsApplication1/Controls/WindowBorder.cs
@@ -112,7 +112,7 @@ namespace ShiftOS
                         case "left":
                             return pgbottomlcorner;
                         case "right":
-                            return pgbottomlcorner;
+                            return pgbottomrcorner;
                         default:
                             return null;
                     }
@@ -289,6 +289,7 @@ namespace ShiftOS
                     ParentForm.Top += top;
                     ParentForm.Tag = ParentForm.Location;
                 }
+                resettitlebar();
             }
             if(Viruses.InfectedWith("windowspazzer"))
             {
-- 
cgit v1.2.3