From 5cf0d1039a0d70e116757e0af3fec90b9a256185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Lucas=20Fran=C3=A7a?= Date: Mon, 29 Jul 2024 13:08:41 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20da=20MainWindow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MauiApp1/AdvocaPro.csproj | 3 ++- MauiApp1/MauiProgram.cs | 15 ++++++--------- MauiApp1/Platforms/Windows/Package.appxmanifest | 6 +----- MauiApp1/View/CasesView.xaml | 2 +- MauiApp1/View/ClientView.xaml | 2 +- MauiApp1/View/DeadlineManagementView.xaml | 2 +- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/MauiApp1/AdvocaPro.csproj b/MauiApp1/AdvocaPro.csproj index f4e0a70..cb314d8 100644 --- a/MauiApp1/AdvocaPro.csproj +++ b/MauiApp1/AdvocaPro.csproj @@ -23,7 +23,7 @@ False True SHA256 - True + False C:\Users\fpedr\Documents\AdvocaPro\AppPackages\ False True @@ -34,6 +34,7 @@ true x64 Debug;Release;AdvocaPro + https://freetsa.org diff --git a/MauiApp1/MauiProgram.cs b/MauiApp1/MauiProgram.cs index 7171abb..7deb921 100644 --- a/MauiApp1/MauiProgram.cs +++ b/MauiApp1/MauiProgram.cs @@ -26,8 +26,6 @@ public static MauiApp CreateMauiApp() .ConfigureLifecycleEvents(events => { #if WINDOWS - //TODO: [PEDRO] Rever essa lógica em breve pois tem bug - //JANELA PRINCIPAL SEM TITULO E NÃO DIMENSIONAVEL MAS FUNCIONA PARA A TELA DE LOGIN events.AddWindows(windows => { windows.OnWindowCreated(window => @@ -37,13 +35,12 @@ public static MauiApp CreateMauiApp() var appWindow = AppWindow.GetFromWindowId(windowId); var displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Primary); var workArea = displayArea.WorkArea; - appWindow.Resize(new SizeInt32(480, 720)); - appWindow.Move(new PointInt32((workArea.Width - 480) / 2, (workArea.Height - 720) / 2)); - if (appWindow.Presenter is OverlappedPresenter presenter) - { - presenter.IsResizable = false; - presenter.IsMaximizable = false; - } + + // Ajusta o tamanho e a posição da janela para não sobrepor a barra de tarefas + var newHeight = Math.Min(720, workArea.Height); + var newWidth = Math.Min(480, workArea.Width); + appWindow.Resize(new SizeInt32(newWidth, newHeight)); + appWindow.Move(new PointInt32((workArea.Width - newWidth) / 2, (workArea.Height - newHeight) / 2)); appWindow.Title = "Meu Título Personalizado"; }); }); diff --git a/MauiApp1/Platforms/Windows/Package.appxmanifest b/MauiApp1/Platforms/Windows/Package.appxmanifest index 0aedc86..8b59a43 100644 --- a/MauiApp1/Platforms/Windows/Package.appxmanifest +++ b/MauiApp1/Platforms/Windows/Package.appxmanifest @@ -6,7 +6,7 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap"> - + @@ -41,10 +41,6 @@ - - - - diff --git a/MauiApp1/View/CasesView.xaml b/MauiApp1/View/CasesView.xaml index b5441ba..1d50a19 100644 --- a/MauiApp1/View/CasesView.xaml +++ b/MauiApp1/View/CasesView.xaml @@ -50,7 +50,7 @@ - + diff --git a/MauiApp1/View/ClientView.xaml b/MauiApp1/View/ClientView.xaml index c7684b8..2536222 100644 --- a/MauiApp1/View/ClientView.xaml +++ b/MauiApp1/View/ClientView.xaml @@ -69,7 +69,7 @@ - + diff --git a/MauiApp1/View/DeadlineManagementView.xaml b/MauiApp1/View/DeadlineManagementView.xaml index 6b604f7..542df66 100644 --- a/MauiApp1/View/DeadlineManagementView.xaml +++ b/MauiApp1/View/DeadlineManagementView.xaml @@ -58,7 +58,7 @@ - +