Browse Source
Merge branch 'master' into fixes/1448
pull/1512/head
Steven Kirk
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
3 deletions
-
src/Avalonia.Controls/TextBox.cs
-
src/Avalonia.Controls/Utils/UndoRedoHelper.cs
|
|
|
@ -275,8 +275,11 @@ namespace Avalonia.Controls |
|
|
|
|
|
|
|
protected override void OnTextInput(TextInputEventArgs e) |
|
|
|
{ |
|
|
|
HandleTextInput(e.Text); |
|
|
|
e.Handled = true; |
|
|
|
if (!e.Handled) |
|
|
|
{ |
|
|
|
HandleTextInput(e.Text); |
|
|
|
e.Handled = true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void HandleTextInput(string input) |
|
|
|
|
|
|
|
@ -59,7 +59,7 @@ namespace Avalonia.Controls.Utils |
|
|
|
|
|
|
|
public void UpdateLastState() |
|
|
|
{ |
|
|
|
_states.Last.Value = _host.UndoRedoState; |
|
|
|
UpdateLastState(_host.UndoRedoState); |
|
|
|
} |
|
|
|
|
|
|
|
public void DiscardRedo() |
|
|
|
@ -94,6 +94,7 @@ namespace Avalonia.Controls.Utils |
|
|
|
public void Clear() |
|
|
|
{ |
|
|
|
_states.Clear(); |
|
|
|
_currentNode = null; |
|
|
|
} |
|
|
|
|
|
|
|
bool WeakTimer.IWeakTimerSubscriber.Tick() |
|
|
|
|