From 807e41c8de43f3a920e02e7f20f4724e360ae708 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 9 Jul 2024 15:07:48 -0400
Subject: Prevent unnecessary refreshes that move focus.
Spillover from having more interactive controls. In WiX v3, showing a
page moved the focus as a typical person might expect. When WiX v4
added interactivity, the same code was used to update controls (e.g.,
when checking a checkbox set a property used in a `VisibleCondition` or
`EnableCondition` for another control on the same page). This change
prevents the focus-setting behavior if the same page is being shown.
Fixes https://github.com/wixtoolset/issues/issues/8144
---
src/libs/dutil/WixToolset.DUtil/thmutil.cpp | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
(limited to 'src/libs')
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index 910b05c2..3e7e0fc6 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -312,13 +312,14 @@ static HRESULT ShowControl(
__in BOOL fSaveEditboxes,
__in THEME_SHOW_PAGE_REASON reason,
__in DWORD dwPageId,
- __out_opt HWND* phwndFocus
+ __inout_opt HWND* phwndFocus
);
static HRESULT ShowControls(
__in THEME* pTheme,
__in_opt const THEME_CONTROL* pParentControl,
__in int nCmdShow,
__in BOOL fSaveEditboxes,
+ __in BOOL fSetFocus,
__in THEME_SHOW_PAGE_REASON reason,
__in DWORD dwPageId
);
@@ -1192,8 +1193,9 @@ DAPI_(HRESULT) ThemeShowPageEx(
BOOL fHide = SW_HIDE == nCmdShow;
BOOL fSaveEditboxes = FALSE;
THEME_SAVEDVARIABLE* pSavedVariable = NULL;
- THEME_PAGE* pPage = ThemeGetPage(pTheme, dwPage);
SIZE_T cb = 0;
+ BOOL fSetFocus = dwPage != pTheme->dwCurrentPageId;
+ THEME_PAGE* pPage = ThemeGetPage(pTheme, dwPage);
if (pPage)
{
@@ -1257,7 +1259,7 @@ DAPI_(HRESULT) ThemeShowPageEx(
}
}
- hr = ShowControls(pTheme, NULL, nCmdShow, fSaveEditboxes, reason, dwPage);
+ hr = ShowControls(pTheme, NULL, nCmdShow, fSaveEditboxes, fSetFocus, reason, dwPage);
ThmExitOnFailure(hr, "Failed to show page controls.");
LExit:
@@ -5561,7 +5563,7 @@ static HRESULT ShowControl(
__in BOOL fSaveEditboxes,
__in THEME_SHOW_PAGE_REASON reason,
__in DWORD dwPageId,
- __out_opt HWND* phwndFocus
+ __inout_opt HWND* phwndFocus
)
{
HRESULT hr = S_OK;
@@ -5810,7 +5812,7 @@ static HRESULT ShowControl(
if (0 < pControl->cControls)
{
- ShowControls(pTheme, pControl, nCmdShow, fSaveEditboxes, reason, dwPageId);
+ ShowControls(pTheme, pControl, nCmdShow, fSaveEditboxes, FALSE/*fSetFocus*/, reason, dwPageId);
}
if (THEME_CONTROL_TYPE_BILLBOARD == pControl->type && pControl->wPageId)
@@ -5842,6 +5844,7 @@ static HRESULT ShowControls(
__in_opt const THEME_CONTROL* pParentControl,
__in int nCmdShow,
__in BOOL fSaveEditboxes,
+ __in BOOL fSetFocus,
__in THEME_SHOW_PAGE_REASON reason,
__in DWORD dwPageId
)
@@ -5865,7 +5868,7 @@ static HRESULT ShowControls(
}
}
- if (hwndFocus)
+ if (fSetFocus && hwndFocus)
{
::SendMessage(pTheme->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwndFocus, TRUE);
}
--
cgit v1.2.3-55-g6feb