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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
1 deletions
-
samples/ControlCatalog/MainView.xaml.cs
-
src/Avalonia.Controls/TopLevel.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; |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
} |
|
|
} |
|
|
|