Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port IME/databinding fix from 4.8. #5840

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Port IME/databinding fix from 4.8. #5840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ...crosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingExpressionBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ internal virtual bool Validate(object value, ValidationStep validationStep)
ValidationError oldValidationError = GetValidationErrors(validationStep);

// ignore an error from the implicit DataError rule - this is checked
// separately (in BindingExpression.Validate).
// separately (in BindingExpression.Validate).
if (oldValidationError != null &&
oldValidationError.RuleInError == DataErrorValidationRule.Instance)
{
Expand Down Expand Up @@ -1484,6 +1484,15 @@ private void ProcessDirty()
{
if (IsUpdateOnPropertyChanged)
{
// cancel a pending UpdateTarget, so that it doesn't negate
// the effect of this change to the target value
DispatcherOperation op = (DispatcherOperation)GetValue(Feature.UpdateTargetOperation, null);
if (op != null)
{
ClearValue(Feature.UpdateTargetOperation);
op.Abort();
}

if (Helper.IsComposing(Target, TargetProperty))
{
// wait for the IME composition to complete
Expand Down