From e9919e7f89628809be4c6f0888ff0149addd782e Mon Sep 17 00:00:00 2001
From: eccles <eccles@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 5 Jan 2004 21:53:06 +0000
Subject: [PATCH] Links and Buttons no longer receive the initial keyboard
 focus as they take over the Enter key.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3361 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  62 +++++++++++---------
 Plugins/InstallOptions.dll                  | Bin 12288 -> 12288 bytes
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index ec8509ef..f456f8b8 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -53,21 +53,27 @@ char *WINAPI STRDUP(const char *c)
   return lstrcpy(t,c);
 }
 
+// Field types
+// NB - the order of this list is important - see below
+
 #define FIELD_INVALID      (0)
 #define FIELD_LABEL        (1)
 #define FIELD_ICON         (2)
 #define FIELD_BITMAP       (3)
 #define FIELD_BROWSEBUTTON (4)
-#define FIELD_CHECKBOX     (5)
-#define FIELD_RADIOBUTTON  (6)
-#define FIELD_TEXT         (7)
-#define FIELD_FILEREQUEST  (8)
-#define FIELD_DIRREQUEST   (9)
-#define FIELD_COMBOBOX     (10)
-#define FIELD_LISTBOX      (11)
-#define FIELD_GROUPBOX     (12)
-#define FIELD_LINK         (13)
-#define FIELD_BUTTON       (14)
+#define FIELD_LINK         (5)
+#define FIELD_BUTTON       (6)
+#define FIELD_GROUPBOX     (7)
+#define FIELD_CHECKBOX     (8)
+#define FIELD_RADIOBUTTON  (9)
+#define FIELD_TEXT         (10)
+#define FIELD_FILEREQUEST  (11)
+#define FIELD_DIRREQUEST   (12)
+#define FIELD_COMBOBOX     (13)
+#define FIELD_LISTBOX      (14)
+
+#define FIELD_SETFOCUS     FIELD_CHECKBOX // First field that qualifies for having the initial keyboard focus
+#define FIELD_CHECKLEN     FIELD_TEXT     // First field to have length of state value checked against MinLen/MaxLen
 
 //---------------------------------------------------------------------
 // settings
@@ -216,7 +222,7 @@ bool INLINE ValidateFields() {
     FieldType *pField = pFields + nIdx;
     // this if statement prevents a stupid bug where a min/max length is assigned to a label control
     // where the user obviously has no way of changing what is displayed. (can you say, "infinite loop"?)
-    if (pField->nType >= FIELD_TEXT) {
+    if (pField->nType >= FIELD_CHECKLEN) {
       nLength = mySendMessage(pField->hwnd, WM_GETTEXTLENGTH, 0, 0);
 
       if (((pField->nMaxLength > 0) && (nLength > pField->nMaxLength)) ||
@@ -939,6 +945,21 @@ int WINAPI createCfgDlg()
         DEFAULT_STYLES | WS_TABSTOP,
         0,
         WS_EX_RTLREADING },
+      { "BUTTON",       // FIELD_LINK
+        DEFAULT_STYLES | WS_TABSTOP | BS_OWNERDRAW,
+        DEFAULT_STYLES | WS_TABSTOP | BS_OWNERDRAW | BS_RIGHT,
+        0,
+        WS_EX_RTLREADING },
+      { "BUTTON",       // FIELD_BUTTON
+        DEFAULT_STYLES | WS_TABSTOP,
+        DEFAULT_STYLES | WS_TABSTOP,
+        0,
+        WS_EX_RTLREADING },
+      { "BUTTON",       // FIELD_GROUPBOX
+        DEFAULT_STYLES | BS_GROUPBOX,
+        DEFAULT_STYLES | BS_GROUPBOX | BS_RIGHT,
+        WS_EX_TRANSPARENT,
+        WS_EX_TRANSPARENT | WS_EX_RTLREADING },
       { "BUTTON",       // FIELD_CHECKBOX
         DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX | BS_MULTILINE,
         DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX | BS_MULTILINE | BS_RIGHT | BS_LEFTTEXT,
@@ -973,22 +994,7 @@ int WINAPI createCfgDlg()
         DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
         DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE,
-        WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_RIGHT | WS_EX_RTLREADING },
-      { "BUTTON",       // FIELD_GROUPBOX
-        DEFAULT_STYLES | BS_GROUPBOX,
-        DEFAULT_STYLES | BS_GROUPBOX | BS_RIGHT,
-        WS_EX_TRANSPARENT,
-        WS_EX_TRANSPARENT | WS_EX_RTLREADING },
-      { "BUTTON",       // FIELD_LINK
-        DEFAULT_STYLES | WS_TABSTOP | BS_OWNERDRAW,
-        DEFAULT_STYLES | WS_TABSTOP | BS_OWNERDRAW | BS_RIGHT,
-        0,
-        WS_EX_RTLREADING },
-      { "BUTTON",       // FIELD_BUTTON
-        DEFAULT_STYLES | WS_TABSTOP,
-        DEFAULT_STYLES | WS_TABSTOP,
-        0,
-        WS_EX_RTLREADING }
+        WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_RIGHT | WS_EX_RTLREADING }
     };
 
     FieldType *pField = pFields + nIdx;
@@ -1216,7 +1222,7 @@ int WINAPI createCfgDlg()
       }
 
       // Set initial focus to the first appropriate field
-      if (!fFocused && (dwStyle & (WS_TABSTOP | WS_DISABLED)) == WS_TABSTOP) {
+      if (!fFocused && (dwStyle & (WS_TABSTOP | WS_DISABLED)) == WS_TABSTOP && pField->nType >= FIELD_SETFOCUS) {
         fFocused = TRUE;
         mySetFocus(hwCtrl);
       }
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index fe9dea353f118cfcd465f3a8d768a81135b37bd6..5873e6ca6d867bf7f335e812ad7d11509822166a 100644
GIT binary patch
delta 3168
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

delta 3270
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
W@v?Xw$`lV}vX!999`~G;+<yR+T;W~-