From cd224be8ac8668a0e0cec982dc4c8c6d58e3c066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= Date: Fri, 19 Jul 2024 18:23:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=E5=90=8E=20=E7=AA=97=E5=8F=A3=E4=BB=8D=E5=8F=AF=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E7=9A=84=E9=97=AE=E9=A2=98=20https://github.com/irihi?= =?UTF-8?q?tech/Ursa.Avalonia/issues/298?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Ursa/Controls/TitleBar/TitleBar.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Ursa/Controls/TitleBar/TitleBar.cs b/src/Ursa/Controls/TitleBar/TitleBar.cs index a4319b9..edcdc8b 100644 --- a/src/Ursa/Controls/TitleBar/TitleBar.cs +++ b/src/Ursa/Controls/TitleBar/TitleBar.cs @@ -49,6 +49,11 @@ public class TitleBar: ContentControl private void OnPointerPressed(object sender, PointerPressedEventArgs e) { + if(_visualRoot is not null + && _visualRoot.WindowState == WindowState.FullScreen) + { + return; + } if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) { if (e.ClickCount < 2) @@ -62,7 +67,8 @@ public class TitleBar: ContentControl { if (_visualRoot is not null) { - if (_visualRoot.WindowState == WindowState.Maximized) + if (_visualRoot.WindowState == WindowState.Maximized + || _visualRoot.WindowState == WindowState.FullScreen) { _visualRoot.WindowState = WindowState.Normal; } From 4b30d3994f1ac0a127e339f44a348a271032f4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8A=BC?= Date: Sun, 21 Jul 2024 15:04:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=20=E5=8F=8C=E5=87=BB=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=85=A8=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Ursa/Controls/TitleBar/TitleBar.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Ursa/Controls/TitleBar/TitleBar.cs b/src/Ursa/Controls/TitleBar/TitleBar.cs index edcdc8b..36dcaea 100644 --- a/src/Ursa/Controls/TitleBar/TitleBar.cs +++ b/src/Ursa/Controls/TitleBar/TitleBar.cs @@ -67,8 +67,12 @@ public class TitleBar: ContentControl { if (_visualRoot is not null) { - if (_visualRoot.WindowState == WindowState.Maximized - || _visualRoot.WindowState == WindowState.FullScreen) + if ( _visualRoot.WindowState == WindowState.FullScreen) + { + return; + } + + if (_visualRoot.WindowState == WindowState.Maximized) { _visualRoot.WindowState = WindowState.Normal; }