chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #499 from irihitech/title

Browse Source 
TitleBar improvement
This commit is contained in:
Dong Bin
2024-12-08 17:44:26 +08:00
committed by GitHub
parent 7510a4e7f4 017ac58b88
commit 370c0d68dd
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ursa/Controls/TitleBar/CaptionButtons.cs
View File

@@ -75,8 +75,9 @@ public class CaptionButtons: Avalonia.Controls.Chrome.CaptionButtons
}
}
}
public override void Attach(Window hostWindow)
public override void Attach(Window? hostWindow)
{
if (hostWindow is null) return;
base.Attach(hostWindow);
_windowStateSubscription = HostWindow?.GetObservable(Window.WindowStateProperty).Subscribe(_ =>
{

33
src/Ursa/Controls/TitleBar/TitleBar.cs
View File

@@ -1,16 +1,20 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Irihi.Avalonia.Shared.Common;
using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
[PseudoClasses(PseudoClassName.PC_Active)]
public class TitleBar: ContentControl
{
private CaptionButtons? _captionButtons;
private InputElement? _background;
private Window? _visualRoot;
private IDisposable? _activeSubscription;
public static readonly StyledProperty<object?> LeftContentProperty = AvaloniaProperty.Register<TitleBar, object?>(
nameof(LeftContent));
@@ -45,19 +49,27 @@ public class TitleBar: ContentControl
this._captionButtons?.Detach();
this._captionButtons = e.NameScope.Get<CaptionButtons>("PART_CaptionButtons");
this._background = e.NameScope.Get<InputElement>("PART_Background");
if (!(this.VisualRoot is Window visualRoot))
return;
_visualRoot = visualRoot;
DoubleTappedEvent.AddHandler(OnDoubleTapped, _background);
PointerPressedEvent.AddHandler(OnPointerPressed, _background);
this._captionButtons?.Attach(visualRoot);
// this.UpdateSize(visualRoot);
this._captionButtons?.Attach(_visualRoot);
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
_visualRoot = this.VisualRoot as Window;
if (_visualRoot is not null)
{
_activeSubscription = _visualRoot.GetObservable(WindowBase.IsActiveProperty).Subscribe(isActive =>
{
PseudoClasses.Set(PseudoClassName.PC_Active, isActive);
});
}
}
private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
{
if(_visualRoot is not null
&& _visualRoot.WindowState == WindowState.FullScreen)
if(_visualRoot is not null && _visualRoot.WindowState == WindowState.FullScreen)
{
return;
}
@@ -96,4 +108,11 @@ public class TitleBar: ContentControl
this._captionButtons.Height = this.Height;
}
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
_captionButtons?.Detach();
_activeSubscription?.Dispose();
}
}