Merge branch 'net-6-workload' of https://github.com/dotnet/Comet into net-6-workload
This commit is contained in:
Коммит
696a2035e5
|
@ -1 +1 @@
|
|||
Subproject commit 57e72b966eed1c1c24071afa632cb83090b46e97
|
||||
Subproject commit 539b92fbec8a447129a1ce33433fde588a9e97e1
|
|
@ -27,32 +27,5 @@ namespace Comet
|
|||
|
||||
|
||||
public string Title => this.Content.GetTitle();
|
||||
|
||||
IWindowHandler windowHandler;
|
||||
|
||||
bool SetViewHandler(IWindowHandler handler)
|
||||
{
|
||||
if (windowHandler == handler)
|
||||
return false;
|
||||
InvalidateMeasurement();
|
||||
var oldViewHandler = windowHandler;
|
||||
//viewHandler?.Remove(this);
|
||||
windowHandler = handler;
|
||||
if (windowHandler?.VirtualView != this)
|
||||
windowHandler?.SetVirtualView(this);
|
||||
if (ReplacedView != null)
|
||||
((IElement)ReplacedView).Handler = handler;
|
||||
//AddAllAnimationsToManager();
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
IElementHandler IElement.Handler
|
||||
{
|
||||
get => this.ViewHandler;
|
||||
set => SetViewHandler((IWindowHandler)value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче