From 6df245dd6857456a2c1d74f5daede0f82188bd0a Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov <dmitry@codeweavers.com> Date: Mon, 9 Apr 2001 18:30:25 +0000 Subject: [PATCH] Really do not roll up if selection is being tracked by arrow keys in the dropdown listbox. --- controls/combo.c | 4 +--- controls/listbox.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/controls/combo.c b/controls/combo.c index 8059e457857..cb1d2a97f98 100644 --- a/controls/combo.c +++ b/controls/combo.c @@ -1422,9 +1422,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) /* do not roll up if selection is being tracked * by arrowkeys in the dropdown listbox */ - - if( (lphc->dwStyle & CBS_SIMPLE) || - ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) + if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) { CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); } diff --git a/controls/listbox.c b/controls/listbox.c index f50fe9ab10b..252cff7e587 100644 --- a/controls/listbox.c +++ b/controls/listbox.c @@ -2307,7 +2307,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM wParam ) LISTBOX_SetSelection( wnd, descr, caret, TRUE, FALSE); if (descr->style & LBS_NOTIFY) { - if( descr->lphc && CB_GETTYPE(descr->lphc) != CBS_SIMPLE ) + if( descr->lphc ) { /* make sure that combo parent doesn't hide us */ descr->lphc->wState |= CBF_NOROLLUP; -- GitLab