From c31682240d6458303e9b63532ac5ca300c211452 Mon Sep 17 00:00:00 2001 From: eccles Date: Sat, 13 Dec 2003 17:17:03 +0000 Subject: [PATCH] Only validate if pressing the Next button. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3271 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 4 ++-- Contrib/InstallOptions/testnotify.ini | 1 + Plugins/InstallOptions.dll | Bin 12288 -> 12288 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 52e68b42..fe5a5d70 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -674,7 +674,7 @@ BOOL CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara if (message == WM_NOTIFY_OUTER_NEXT && wParam == 1) { // Don't call leave function if fields aren't valid - if (!ValidateFields()) + if (!g_NotifyField && !ValidateFields()) return 0; // Get the settings ready for the leave function verification SaveSettings(); @@ -728,7 +728,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) // Calculate needed size of the control DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_SINGLELINE | DT_CALCRECT); - + // Move rect to right if in RTL mode if (bRTL) { diff --git a/Contrib/InstallOptions/testnotify.ini b/Contrib/InstallOptions/testnotify.ini index f741b568..3bea95c7 100644 --- a/Contrib/InstallOptions/testnotify.ini +++ b/Contrib/InstallOptions/testnotify.ini @@ -72,6 +72,7 @@ Left=10 Right=-10 Top=97 Bottom=118 +MinLen=1 [Field 9] Type=Button diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 348a87a687afe2a072f70e8538ea55e13a3e740b..c5bc7d01ce062758bee4a8ef2f6717fee4022324 100644 GIT binary patch delta 2034 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