Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -465,6 +466,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -453,6 +454,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -453,6 +454,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -456,6 +457,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
2 changes: 2 additions & 0 deletions src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -435,6 +436,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.SetResponse(int cod
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.Uri.get -> System.Uri!
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(Microsoft.Maui.Controls.PlatformWebViewWebResourceRequestedEventArgs! platformArgs) -> void
Microsoft.Maui.Controls.WebViewWebResourceRequestedEventArgs.WebViewWebResourceRequestedEventArgs(System.Uri! uri, string! method) -> void
Microsoft.Maui.Controls.Window.IsActivated.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
Expand Down Expand Up @@ -435,6 +436,7 @@ static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsof
~static readonly Microsoft.Maui.Controls.TemplatedView.IsClippedToBoundsProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TemplatedView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
~static readonly Microsoft.Maui.Controls.TimePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
static readonly Microsoft.Maui.Controls.Window.IsActivatedProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMaximizableProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.Window.IsMinimizableProperty -> Microsoft.Maui.Controls.BindableProperty!
~virtual Microsoft.Maui.Controls.BindableProperty.BindingPropertyChangedDelegate.Invoke(Microsoft.Maui.Controls.BindableObject bindable, object oldValue, object newValue) -> void
Expand Down
40 changes: 21 additions & 19 deletions src/Controls/src/Core/Window/Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ namespace Microsoft.Maui.Controls
[ContentProperty(nameof(Page))]
public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuBarElement, IFlowDirectionController, IWindowController
{
static readonly BindablePropertyKey IsActivatedPropertyKey =
BindableProperty.CreateReadOnly(nameof(IsActivated), typeof(bool), typeof(Window), false, propertyChanged: OnIsActivatedPropertyChanged);

/// <summary>Bindable property for <see cref="IsActivated"/>.</summary>
public static readonly BindableProperty IsActivatedProperty = IsActivatedPropertyKey.BindableProperty;

/// <summary>Bindable property for <see cref="Title"/>.</summary>
public static readonly BindableProperty TitleProperty = BindableProperty.Create(
nameof(Title), typeof(string), typeof(Window), default(string?));
Expand Down Expand Up @@ -76,7 +82,6 @@ public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuB
List<IVisualTreeElement> _visualChildren;
Toolbar? _toolbar;
MenuBarTracker _menuBarTracker;
bool _isActivated;

IToolbar? IToolbarElement.Toolbar => Toolbar;
internal Toolbar? Toolbar
Expand Down Expand Up @@ -117,6 +122,12 @@ public string? Title
set => SetValue(TitleProperty, value);
}

public bool IsActivated
{
get => (bool)GetValue(IsActivatedProperty);
private set => SetValue(IsActivatedPropertyKey, value);
}

string? ITitledElement.Title => Title ?? (Page as Shell)?.Title;

public Page? Page
Expand Down Expand Up @@ -324,24 +335,6 @@ public bool RemoveOverlay(IWindowOverlay overlay)
internal IMauiContext MauiContext =>
Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext is null.");

internal bool IsActivated
{
get
{
return _isActivated;
}
private set
{
if (_isActivated == value)
return;

_isActivated = value;

if (value)
SendWindowAppearing();
}
}

internal bool IsDestroyed { get; private set; }
internal bool IsCreated { get; private set; }

Expand Down Expand Up @@ -634,6 +627,15 @@ static void OnPageChanging(BindableObject bindable, object oldValue, object newV
oldPage.SendDisappearing();
}

static void OnIsActivatedPropertyChanged(BindableObject bindable, object oldValue, object newValue)
{
var window = (Window)bindable;
if ((bool)newValue)
{
window.SendWindowAppearing();
}
}

void OnPageChanged(Page? oldPage, Page? newPage)
{
if (oldPage != null)
Expand Down
98 changes: 98 additions & 0 deletions src/Controls/tests/Core.UnitTests/WindowsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Maui.Graphics;
using Xunit;
Expand Down Expand Up @@ -649,6 +650,74 @@ public void PreviousShellDisconnectsFromWindowPropertyChanged()
Assert.False(fired);
}

[Fact]
public void CreateWindowKeepIsActivatedIsFalse()
{
var app = new TestApp();

var window = app.CreateWindow();

Assert.False(window.IsActivated);
}

[Fact]
public void ActivateWindowWillSetIsActiveToTrue()
{
var app = new TestApp();

var window = app.CreateWindow();

(window as IWindow).Activated();

Assert.True(window.IsActivated);
}

[Fact]
public void ActivateWindowAndDeactivateWillSetIsActiveToFalse()
{
var app = new TestApp();

var window = app.CreateWindow();

(window as IWindow).Activated();

Assert.True(window.IsActivated);

(window as IWindow).Deactivated();

Assert.False(window.IsActivated);
}

[Fact]
public async Task ActivateWindowSendAppearingOnPage()
{
var app = new TestApp();

var window = app.CreateWindow();

var page = new ContentPage();

window.Page = page;

page.SendDisappearing();

var tcs = new TaskCompletionSource<bool>();

using var cts = new CancellationTokenSource();
using var _ = cts.Token.Register(() => tcs.SetResult(false));

page.Appearing += (_, __) =>
{
tcs.SetResult(true);
};

cts.CancelAfter(TimeSpan.FromSeconds(5));

(window as IWindow).Activated();

Assert.True(await tcs.Task);
}

[Theory]
[InlineData(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN)]
[InlineData(-1, -1, -1, -1, -1, -1, double.NaN, double.NaN)]
Expand Down Expand Up @@ -766,5 +835,34 @@ public async Task TwoKeysSameWindow()
Assert.Same(window, actual);
Assert.Empty(table);
}

[Fact]
public void BindingIsActivatedProperty()
{
var app = new TestApp();
var page = new ContentPage();
var window = app.CreateWindow();
window.Page = page;

var vm = new ViewModel();
window.BindingContext = vm;
window.SetBinding(Window.IsActivatedProperty, nameof(vm.IsWindowActive));

(window as IWindow).Activated();

Assert.True(vm.IsWindowActive);

(window as IWindow).Deactivated();

Assert.False(vm.IsWindowActive);
}
}

class ViewModel
{
public bool IsWindowActive
{
get; set;
}
}
}
52 changes: 52 additions & 0 deletions src/Controls/tests/DeviceTests/Elements/Window/WindowTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -232,5 +232,57 @@ await firstPage.Handler.MauiContext.Services.GetRequiredService<IDispatcher>()

Assert.True(passed);
}

[Fact]
public async Task WindowIsActivedRespondToMethodsCall()
{
SetupBuilder();
var page = new ContentPage();
var window = new Window(page);

await CreateHandlerAndAddToWindow<WindowHandlerStub>(window, (h) =>
{
var w = h.VirtualView;

Assert.True(window.IsActivated);

w.Deactivated();

Assert.False(window.IsActivated);
});
}

[Fact]
public async Task SwitchBetweenWindowShouldTriggerIsActivated()
{
SetupBuilder();
var page = new ContentPage();
var app = ApplicationServices.GetService<IApplication>() as ApplicationStub;

var window1 = new Window(page);
var window2 = new Window(page);

await CreateHandlerAndAddToWindow<WindowHandlerStub>(window1, (h) =>
{
app.OpenWindow(window1);
Assert.True(window1.IsActivated);
Assert.False(window2.IsActivated);
});


await CreateHandlerAndAddToWindow<WindowHandlerStub>(window2, (h) =>
{
app.OpenWindow(window2);

Assert.False(window1.IsActivated);
Assert.True(window2.IsActivated);
});

app.CloseWindow(window2);
app.CloseWindow(window1);

Assert.False(window1.IsActivated);
Assert.False(window2.IsActivated);
}
}
}
Loading