Refactoring

SpaceMadness · Dec 20, 2016 · 98fbb9b · 98fbb9b
1 parent 560b4bf
commit 98fbb9b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/Project/Assets/LunarPlugin/Editor/Core/CEditorMenu.cs b/Project/Assets/LunarPlugin/Editor/Core/CEditorMenu.cs
@@ -34,7 +34,7 @@ static class CEditorMenu
         [MenuItem("Window/Lunar/Terminal %#t")]
         public static void ShowTerminal()
         {
-            TerminalWindow.ShowWindow();
+            CTerminalWindow.ShowWindow();
         }
 
         [MenuItem("Window/Lunar/Console %#&c")]

diff --git a/Project/Assets/LunarPlugin/Editor/UI/CSearchField.cs b/Project/Assets/LunarPlugin/Editor/UI/CSearchField.cs
@@ -24,7 +24,7 @@
 
 namespace LunarEditor
 {
-    class CSearchField : TextField
+    class CSearchField : CTextField
     {
         protected override string CreateTextField(string text)
         {

diff --git a/Project/Assets/LunarPlugin/Editor/UI/CTerminalCompositeView.cs b/Project/Assets/LunarPlugin/Editor/UI/CTerminalCompositeView.cs
@@ -30,24 +30,24 @@
 
 namespace LunarEditor
 {
-    interface ITerminalCompositeViewDelegate
+    interface ICTerminalCompositeViewDelegate
     {
         void ExecCommand(string commandLine);
         CTerminal Terminal { get; }
     }
 
-    class TerminalCompositeView : View
+    class CTerminalCompositeView : View
     {
         private CConsoleView m_consoleView;
-        private TextField m_commandField;
+        private CTextField m_commandField;
         private ToolBarLabel m_infoLabel;
 
-        private ITerminalCompositeViewDelegate m_delegate;
+        private ICTerminalCompositeViewDelegate m_delegate;
 
         private float m_lastTabTimestamp;
         private string m_lastUserInput;
 
-        public TerminalCompositeView(ITerminalCompositeViewDelegate del, float width, float height)
+        public CTerminalCompositeView(ICTerminalCompositeViewDelegate del, float width, float height)
             : base(width, height)
         {
             if (del == null)
@@ -99,14 +99,14 @@ private void CreateUI()
 
             AddSubview(toolbar);
 
-            m_commandField = new TextField();
+            m_commandField = new CTextField();
             m_commandField.Width = Width;
             AddSubview(m_commandField);
             m_commandField.AlignX(View.AlignCenter);
             m_commandField.AlignBottom(0);
             m_commandField.AutoresizeMask = ViewAutoresizing.FlexibleTopMargin | ViewAutoresizing.FlexibleWidth;
 
-            m_commandField.TextKeyDelegate = delegate(TextField tf, KeyCode code, bool pressed)
+            m_commandField.TextKeyDelegate = delegate(CTextField tf, KeyCode code, bool pressed)
             {
                 if (pressed)
                 {
@@ -204,7 +204,7 @@ private void CreateUI()
                 return false;
             };
 
-            m_commandField.TextChangedDelegate = delegate(TextField field) {
+            m_commandField.TextChangedDelegate = delegate(CTextField field) {
                 HistoryReset();
             };
 
@@ -236,7 +236,7 @@ private void HistoryPush(string commandLine)
             History.Push(commandLine);
         }
 
-        private bool HistoryNext(TextField tf)
+        private bool HistoryNext(CTextField tf)
         {
             string line = History.Next();
             if (line != null)
@@ -248,7 +248,7 @@ private bool HistoryNext(TextField tf)
             return false;
         }
 
-        private bool HistoryPrev(TextField tf)
+        private bool HistoryPrev(CTextField tf)
         {
             string line = History.Prev();
             if (line != null)

diff --git a/Project/Assets/LunarPlugin/Editor/UI/CTerminalWindow.cs b/Project/Assets/LunarPlugin/Editor/UI/CTerminalWindow.cs
@@ -30,9 +30,9 @@
 
 namespace LunarEditor
 {
-    class TerminalWindow : Window, ITerminalCompositeViewDelegate
+    class CTerminalWindow : Window, ICTerminalCompositeViewDelegate
     {
-        public TerminalWindow()
+        public CTerminalWindow()
             : base("Terminal")
         {
             this.minSize = new Vector2(320, 240);
@@ -42,7 +42,7 @@ public TerminalWindow()
 
         protected override void CreateUI()
         {
-            TerminalCompositeView terminalView = new TerminalCompositeView(this, this.Width, this.Height);
+            CTerminalCompositeView terminalView = new CTerminalCompositeView(this, this.Width, this.Height);
             AddSubview(terminalView);
         }
 
@@ -68,7 +68,7 @@ public CTerminal Terminal
 
         internal static void ShowWindow()
         {
-            EditorWindow.GetWindow<TerminalWindow>();
+            EditorWindow.GetWindow<CTerminalWindow>();
         }
 
         #endregion

diff --git a/Project/Assets/LunarPlugin/Editor/UI/CTextField.cs b/Project/Assets/LunarPlugin/Editor/UI/CTextField.cs
@@ -29,25 +29,25 @@
 
 namespace LunarEditor
 {
-    delegate void TextFieldDelegate(TextField field);
-    delegate bool TextFieldKeyDelegate(TextField field, KeyCode code, bool pressed);
+    delegate void CTextFieldDelegate(CTextField field);
+    delegate bool CTextFieldKeyDelegate(CTextField field, KeyCode code, bool pressed);
 
-    class TextField : View
+    class CTextField : View
     {
         private string m_text;
         private bool m_firstKeyDown;
 
-        public TextField(string text = "")
+        public CTextField(string text = "")
             : this(0, 0, text)
         {
         }
 
-        public TextField(float x, float y, string text = "")
+        public CTextField(float x, float y, string text = "")
             : this(x, y, UISize.TextFieldWidth, UISize.TextFieldHeight, text)
         {
         }
 
-        public TextField(float x, float y, float w, float h, string text = "")
+        public CTextField(float x, float y, float w, float h, string text = "")
             : base(x, y, w, h)
         {
             Text = text;
@@ -228,8 +228,8 @@ public string Text
             }
         }
 
-        public TextFieldDelegate TextChangedDelegate { get; set; }
-        public TextFieldKeyDelegate TextKeyDelegate { get; set; }
+        public CTextFieldDelegate TextChangedDelegate { get; set; }
+        public CTextFieldKeyDelegate TextKeyDelegate { get; set; }
 
         public bool IsCtrlPressed { get; private set; }
         public bool IsAltPressed { get; private set; }