tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix Toplevel not losing focus with native implementation deactivates. (#20768) 

* add failing test

* query the toplevel of the currently focused control instead when losing focus
pull/20773/head
Emmanuel Hansen 4 weeks ago
committed by GitHub
parent
6e497fbe96
commit
d22683f4eb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 55 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      src/Avalonia.Controls/TopLevel.cs
  2. 28
      tests/Avalonia.Controls.UnitTests/TopLevelTests.cs

60
src/Avalonia.Controls/TopLevel.cs
View File

@ -65,9 +65,9 @@ namespace Avalonia.Controls
/// Defines the <see cref="ActualTransparencyLevel"/> property.
/// </summary>
public static readonly DirectProperty<TopLevel, WindowTransparencyLevel> ActualTransparencyLevelProperty =
AvaloniaProperty.RegisterDirect<TopLevel, WindowTransparencyLevel>(nameof(ActualTransparencyLevel),
o => o.ActualTransparencyLevel,
unsetValue: WindowTransparencyLevel.None);
AvaloniaProperty.RegisterDirect<TopLevel, WindowTransparencyLevel>(nameof(ActualTransparencyLevel),
o => o.ActualTransparencyLevel,
unsetValue: WindowTransparencyLevel.None);
/// <summary>
/// Defines the <see cref="TransparencyBackgroundFallback"/> property.
@ -78,7 +78,7 @@ namespace Avalonia.Controls
/// <inheritdoc cref="ThemeVariantScope.ActualThemeVariantProperty" />
public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
ThemeVariantScope.ActualThemeVariantProperty.AddOwner<TopLevel>();
/// <inheritdoc cref="ThemeVariantScope.RequestedThemeVariantProperty" />
public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
ThemeVariantScope.RequestedThemeVariantProperty.AddOwner<TopLevel>();
@ -102,7 +102,7 @@ namespace Avalonia.Controls
/// <summary>
/// Defines the <see cref="BackRequested"/> event.
/// </summary>
public static readonly RoutedEvent<RoutedEventArgs> BackRequestedEvent =
public static readonly RoutedEvent<RoutedEventArgs> BackRequestedEvent =
RoutedEvent.Register<TopLevel, RoutedEventArgs>(nameof(BackRequested), RoutingStrategies.Bubble);
private static readonly WeakEvent<IResourceHost, ResourcesChangedEventArgs>
@ -131,7 +131,7 @@ namespace Avalonia.Controls
private readonly PresentationSource _source;
internal new PresentationSource PresentationSource => _source;
internal IInputRoot InputRoot => _source;
/// <summary>
/// Initializes static members of the <see cref="TopLevel"/> class.
/// </summary>
@ -199,9 +199,9 @@ namespace Avalonia.Controls
_scaling = ValidateScaling(impl.RenderScaling);
_actualTransparencyLevel = PlatformImpl.TransparencyLevel;
_accessKeyHandler = TryGetService<IAccessKeyHandler>(dependencyResolver);
_inputManager = TryGetService<IInputManager>(dependencyResolver);
@ -211,7 +211,7 @@ namespace Avalonia.Controls
_applicationThemeHost = TryGetService<IThemeVariantHost>(dependencyResolver);
impl.Closed = HandleClosed;
impl.Paint = HandlePaint;
@ -257,9 +257,7 @@ namespace Avalonia.Controls
impl.LostFocus += PlatformImpl_LostFocus;
if(impl.TryGetFeature<ISystemNavigationManagerImpl>() is {} systemNavigationManager)
if (impl.TryGetFeature<ISystemNavigationManagerImpl>() is { } systemNavigationManager)
{
systemNavigationManager.BackRequested += (_, e) =>
{
@ -286,14 +284,14 @@ namespace Avalonia.Controls
KeyModifiers = (KeyModifiers)rawKeyEventArgs.Modifiers,
Key = rawKeyEventArgs.Key,
PhysicalKey = rawKeyEventArgs.PhysicalKey,
KeyDeviceType= rawKeyEventArgs.KeyDeviceType,
KeyDeviceType = rawKeyEventArgs.KeyDeviceType,
KeySymbol = rawKeyEventArgs.KeySymbol
};
backRequested = keymap.Any( key => key.Matches(keyEvent));
backRequested = keymap.Any(key => key.Matches(keyEvent));
}
}
else if(e is RawPointerEventArgs pointerEventArgs)
else if (e is RawPointerEventArgs pointerEventArgs)
{
backRequested = pointerEventArgs.Type == RawPointerEventType.XButton1Down;
}
@ -321,7 +319,7 @@ namespace Avalonia.Controls
/// Gets or sets a method called when the TopLevel's scaling changes.
/// </summary>
public event EventHandler? ScalingChanged;
/// <summary>
/// Gets or sets the client size of the window.
/// </summary>
@ -359,7 +357,7 @@ namespace Avalonia.Controls
{
get => _actualTransparencyLevel;
private set => SetAndRaise(ActualTransparencyLevelProperty, ref _actualTransparencyLevel, value);
}
}
/// <summary>
/// Gets or sets the <see cref="IBrush"/> that transparency will blend with when transparency is not supported.
@ -439,7 +437,7 @@ namespace Avalonia.Controls
public RendererDiagnostics RendererDiagnostics => Renderer.Diagnostics;
internal PixelPoint? LastPointerPosition => _source.GetLastPointerPosition(this);
/// <summary>
/// Gets the access key handler for the window.
/// </summary>
@ -448,7 +446,7 @@ namespace Avalonia.Controls
/// <summary>
/// Gets or sets the keyboard navigation handler for the window.
/// </summary>
/// <summary>
/// Helper for setting the color of the platform's system bars.
/// </summary>
@ -573,7 +571,7 @@ namespace Avalonia.Controls
return Disposable.Create(() => { });
}
}
/// <summary>
/// Enqueues a callback to be called on the next animation tick
/// </summary>
@ -582,7 +580,7 @@ namespace Avalonia.Controls
Dispatcher.UIThread.VerifyAccess();
MediaContext.Instance.RequestAnimationFrame(action);
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
@ -602,7 +600,7 @@ namespace Avalonia.Controls
private void InvalidateChildInsetsPadding()
{
if (Content is Control child
&& InsetsManager is {} insetsManager)
&& InsetsManager is { } insetsManager)
{
insetsManager.SafeAreaChanged -= InsetsManagerOnSafeAreaChanged;
_insetsPaddings?.Dispose();
@ -643,12 +641,12 @@ namespace Avalonia.Controls
{
_source.Dispose();
StopRendering();
Debug.Assert(PlatformImpl != null);
// The PlatformImpl is completely invalid at this point
PlatformImpl = null;
_scaling = 1.0;
if (_globalStyles is object)
{
_globalStyles.GlobalStylesAdded -= ((IStyleHost)this).StylesAdded;
@ -658,14 +656,14 @@ namespace Avalonia.Controls
{
_applicationThemeHost.ActualThemeVariantChanged -= GlobalActualThemeVariantChanged;
}
_backGestureSubscription?.Dispose();
var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null);
((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs);
_source.RootVisual = null!;
OnClosed(EventArgs.Empty);
LayoutManager.Dispose();
@ -781,8 +779,8 @@ namespace Avalonia.Controls
private static void OnToolTipServiceEnabledChanged(AvaloniaPropertyChangedEventArgs<bool> args)
{
if (args.GetNewValue<bool>()
&& args.Priority != BindingPriority.Inherited
&& args.Sender is Visual visual
&& args.Priority != BindingPriority.Inherited
&& args.Sender is Visual visual
&& GetTopLevel(visual) is { } topLevel)
{
topLevel.UpdateToolTip(visual.Bounds.Translate((Vector)visual.TranslatePoint(default, topLevel)!));
@ -803,11 +801,7 @@ namespace Avalonia.Controls
void PlatformImpl_LostFocus()
{
var focused = (Visual?)FocusManager?.GetFocusedElement();
if (focused == null)
return;
while (focused.VisualParent != null)
focused = focused.VisualParent;
var focused = TopLevel.GetTopLevel((Visual?)FocusManager?.GetFocusedElement());
if (focused == this)
KeyboardDevice.Instance?.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None, false);

28
tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
View File

@ -253,6 +253,34 @@ namespace Avalonia.Controls.UnitTests
}
}
[Fact]
public void TopLevel_Should_Unfocus_When_Impl_Focus_Is_Lost()
{
using (UnitTestApplication.Start(TestServices.RealFocus))
{
var impl = CreateMockTopLevelImpl(true);
var content = new TextBox()
{
Focusable = true
};
var target = new TestTopLevel(impl.Object)
{
Template = CreateTemplate(),
Focusable = true,
Content = content
};
target.LayoutManager.ExecuteInitialLayoutPass();
content.Focus();
Assert.True(content.IsFocused);
impl.Object.LostFocus?.Invoke();
Assert.False(content.IsFocused);
}
}
[Fact]
public void Reacts_To_Changes_In_Global_Styles()
{

Write Preview
Loading…
Cancel
Save