Fix redo

callumenator · Jul 1, 2013 · e1f7be8 · e1f7be8
1 parent 1fd8451
commit e1f7be8
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/glui/widget/textutil.d b/src/glui/widget/textutil.d
@@ -260,6 +260,9 @@ class STextArea : TextArea
     */
     override void insert(string s)
     {
+        if (s.length == 0)
+            return;
+
         auto preCaret = caret;
         if (s.length == 1 && s[0] == '\n')
         {
@@ -288,7 +291,7 @@ class STextArea : TextArea
         }
 
         if (!undoing)
-            undoStack.push(Change(Change.Type.insert, preCaret, caret, ""));
+            undoStack.push(Change(Change.Type.insert, preCaret, caret, s));
     }
 
     /**
@@ -407,7 +410,7 @@ class STextArea : TextArea
         saveColumn();
 
         if (!undoing)
-            undoStack.push(Change(Change.Type.remove, start, start, deleted));
+            undoStack.push(Change(Change.Type.remove, start, end, deleted));
 
         return deleted;
     }
@@ -783,18 +786,31 @@ class STextArea : TextArea
         {
             remove(action.caretStart, action.caretEnd);
         }
-        else
+        else if (action.type == Change.Type.remove)
         {
             caret = action.caretStart;
             insert(action.data);
         }
+        redoStack.push(action);
         undoing = false;
     }
 
     override void redo()
     {
         if (redoStack.empty)
             return;
+
+        auto action = redoStack.pop();
+
+        if (action.type == Change.Type.remove)
+        {
+            remove(action.caretStart, action.caretEnd);
+        }
+        else if (action.type == Change.Type.insert)
+        {
+            caret = action.caretStart;
+            insert(action.data);
+        }
     }
 
 private:
@@ -891,7 +907,6 @@ struct UndoStack(T, size_t size)
             used++;
 
         _buffer[top] = item;
-        writeln(top);
     }
 
     T pop()