From 1daeba7e77db977974ac1c29842a7a0e1f8c6bf6 Mon Sep 17 00:00:00 2001
From: gokcekantarci <115616017+gokcekantarci@users.noreply.github.com>
Date: Tue, 12 Dec 2023 16:15:26 +0300
Subject: [PATCH] [EnvironmentVariables] EnvironmentVariables window set to
 front when launched. (#30226)

* [EnvironmentVariables] EnvironmentVariables window set to front when launched.

* [EnvironmentVariables] BringToForeground function used instead of SetForegroundWindow.

* [EnvironmentVariables] BringToForeground is moved to MainWindow constructor.

* [EnvironmentVariables] Move 'handle' from class field to local variable in MainWindow constructor.
---
 .../EnvironmentVariablesXAML/MainWindow.xaml.cs        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs
index ec24920054..4ab2cd4e5f 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs
@@ -7,6 +7,7 @@ using System.Runtime.InteropServices;
 using EnvironmentVariables.Helpers;
 using EnvironmentVariables.Helpers.Win32;
 using EnvironmentVariables.ViewModels;
+using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using WinUIEx;
 
@@ -30,19 +31,20 @@ namespace EnvironmentVariables
             Title = title;
             AppTitleTextBlock.Text = title;
 
-            RegisterWindow();
+            var handle = this.GetWindowHandle();
+            RegisterWindow(handle);
+
+            WindowHelpers.BringToForeground(handle);
         }
 
         private static readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
         private static NativeMethods.WinProc newWndProc;
         private static IntPtr oldWndProc = IntPtr.Zero;
 
-        private void RegisterWindow()
+        private void RegisterWindow(IntPtr handle)
         {
             newWndProc = new NativeMethods.WinProc(WndProc);
 
-            var handle = this.GetWindowHandle();
-
             oldWndProc = NativeMethods.SetWindowLongPtr(handle, NativeMethods.WindowLongIndexFlags.GWL_WNDPROC, newWndProc);
         }