From 1cf8bd66e625b0d40e58b114bb6582de41fd69e4 Mon Sep 17 00:00:00 2001
From: Banaanae <83927639+Banaanae@users.noreply.github.com>
Date: Mon, 19 Aug 2024 19:23:54 +1000
Subject: [PATCH] fix +hwnd in gui new

see #281
---
 ConvertFuncs.ahk                              | 13 +++++++++----
 .../Gui-Hwnd_ex4.ah1                          | 15 +++++++++++++++
 .../Gui-Hwnd_ex4.ah2                          | 19 +++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah1
 create mode 100644 tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah2

diff --git a/ConvertFuncs.ahk b/ConvertFuncs.ahk
index 3f48ed35..2aac73d9 100644
--- a/ConvertFuncs.ahk
+++ b/ConvertFuncs.ahk
@@ -1702,6 +1702,7 @@ _Gui(p) {
       ControlLabel := ""
       ControlName := ""
       ControlObject := ""
+      GuiOpt := ""
 
       if (p[1] = "New" && gGuiList != "") {
          if (!InStr(gGuiList, gGuiNameDefault)) {
@@ -1759,8 +1760,7 @@ _Gui(p) {
             }
          }
       }
-      if (RegExMatch(Var3, "i)\b\+?\bhwnd[\w]*\b")) {
-         RegExMatch(Var3, "i)\+?HWND(.*?)(?:\s|$)", &match)
+      if (RegExMatch(Var3, "i)\+?HWND(.*?)(?:\s|$)", &match)) {
          ControlHwnd := match[1]
          Var3 := StrReplace(Var3, match[])
          if (ControlObject = "" && Var4 != "") {
@@ -1771,11 +1771,16 @@ _Gui(p) {
          }
          gmGuiCtrlObj["%" ControlHwnd "%"] := ControlObject
          gmGuiCtrlObj["% " ControlHwnd] := ControlObject
+      } else if (RegExMatch(Var2, "i)\+?HWND(.*?)(?:\s|$)", &match))
+         && (RegExMatch(Var1, "i)(?<!\w)New")) {
+            GuiOpt := Var3
+            GuiOpt := StrReplace(GuiOpt, match[])
+            LineSuffix .= gIndentation match[1] " := " GuiNameLine ".Hwnd"
       }
 
       if (!InStr(gGuiList, "|" GuiNameLine "|")) {
          gGuiList .= GuiNameLine "|"
-         LineResult := GuiNameLine " := Gui()`r`n" gIndentation
+         LineResult := GuiNameLine " := Gui(" GuiOpt ")`r`n" gIndentation
 
          ; Add the events if they are used.
          aEventRename := []
@@ -1854,7 +1859,7 @@ _Gui(p) {
          var1 := "SetFont"
          gGuiActiveFont := ToStringExpr(Var2) ", " ToStringExpr(Var3)
       } else if (var1 = "New") {
-         return Trim(LineResult,"`n")
+         return Trim(LineResult LineSuffix,"`n")
       }
 
       LineResult .= GuiNameLine "."
diff --git a/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah1 b/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah1
new file mode 100644
index 00000000..c3f2621e
--- /dev/null
+++ b/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah1	
@@ -0,0 +1,15 @@
+Gui, Add, Text,, Gui 1`nNormal
+Gui, +HWNDv1
+Gui, Show, w100 h100 y0
+Gui, New, +hwndv2
+Gui, Add, Text,, Gui 2`nNew
+Gui, Show, w100 h100 y150
+Gui, g2:New, +hwndv3
+Gui, g2:Add, Text,, Gui 3`nName:New
+Gui, g2:Show, w100 h100 y300
+Gui, g3: New, +hwndv4
+Gui, g3: Add, Text,, Gui 4`nName: New
+Gui, g3: Show, w100 h100 y450
+Return
+
+^l::MsgBox % v1 "`n" v2 "`n" v3 "`n" v4
\ No newline at end of file
diff --git a/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah2 b/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah2
new file mode 100644
index 00000000..6b129784
--- /dev/null
+++ b/tests/Test_Folder/Graphical User Interfaces/Gui-Hwnd_ex4.ah2	
@@ -0,0 +1,19 @@
+myGui := Gui()
+myGui.Add("Text", , "Gui 1`nNormal")
+v1 := myGui.Hwnd
+myGui.Show("w100 h100 y0")
+myGui1 := Gui()
+v2 := myGui1.Hwnd
+myGui1.Add("Text", , "Gui 2`nNew")
+myGui1.Show("w100 h100 y150")
+g2 := Gui()
+v3 := g2.Hwnd
+g2.Add("Text", , "Gui 3`nName:New")
+g2.Show("w100 h100 y300")
+g3 := Gui()
+v4 := g3.Hwnd
+g3.Add("Text", , "Gui 4`nName: New")
+g3.Show("w100 h100 y450")
+Return
+
+^l::MsgBox(v1 "`n" v2 "`n" v3 "`n" v4)
\ No newline at end of file