Browse Source

Merge branch 'master' into fixes/1448

pull/1512/head
Steven Kirk 9 years ago
committed by GitHub
parent
commit
0ebd79dbce
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/Avalonia.Controls/TextBox.cs
  2. 3
      src/Avalonia.Controls/Utils/UndoRedoHelper.cs

7
src/Avalonia.Controls/TextBox.cs

@ -275,8 +275,11 @@ namespace Avalonia.Controls
protected override void OnTextInput(TextInputEventArgs e) protected override void OnTextInput(TextInputEventArgs e)
{ {
HandleTextInput(e.Text); if (!e.Handled)
e.Handled = true; {
HandleTextInput(e.Text);
e.Handled = true;
}
} }
private void HandleTextInput(string input) private void HandleTextInput(string input)

3
src/Avalonia.Controls/Utils/UndoRedoHelper.cs

@ -59,7 +59,7 @@ namespace Avalonia.Controls.Utils
public void UpdateLastState() public void UpdateLastState()
{ {
_states.Last.Value = _host.UndoRedoState; UpdateLastState(_host.UndoRedoState);
} }
public void DiscardRedo() public void DiscardRedo()
@ -94,6 +94,7 @@ namespace Avalonia.Controls.Utils
public void Clear() public void Clear()
{ {
_states.Clear(); _states.Clear();
_currentNode = null;
} }
bool WeakTimer.IWeakTimerSubscriber.Tick() bool WeakTimer.IWeakTimerSubscriber.Tick()

Loading…
Cancel
Save