Browse Source

Merge pull request #10065 from danielmayost/fixFDPopupBug

Make TopLevel can't be in MirrorTransform state
pull/10071/head
Max Katz 4 years ago
committed by GitHub
parent
commit
4e223040e4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      samples/ControlCatalog/MainView.xaml.cs
  2. 7
      src/Avalonia.Controls/TopLevel.cs

2
samples/ControlCatalog/MainView.xaml.cs

@ -60,7 +60,7 @@ namespace ControlCatalog
{ {
if (flowDirections.SelectedItem is FlowDirection flowDirection) if (flowDirections.SelectedItem is FlowDirection flowDirection)
{ {
this.FlowDirection = flowDirection; TopLevel.GetTopLevel(this).FlowDirection = flowDirection;
} }
}; };

7
src/Avalonia.Controls/TopLevel.cs

@ -615,6 +615,13 @@ namespace Avalonia.Controls
KeyboardDevice.Instance?.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None); KeyboardDevice.Instance?.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None);
} }
protected override bool BypassFlowDirectionPolicies => true;
public override void InvalidateMirrorTransform()
{
// Do nothing becuase TopLevel should't apply MirrorTransform on himself.
}
ITextInputMethodImpl? ITextInputMethodRoot.InputMethod => ITextInputMethodImpl? ITextInputMethodRoot.InputMethod =>
(PlatformImpl as ITopLevelImplWithTextInputMethod)?.TextInputMethod; (PlatformImpl as ITopLevelImplWithTextInputMethod)?.TextInputMethod;
} }

Loading…
Cancel
Save