From 1de283e598f892a726e0ebb4f971f98c3a3d063e Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Mon, 13 Sep 1999 18:29:00 +0000 Subject: [PATCH] temporary fix for scrolling the dropdown until gfx scrollbars get in git-svn-id: svn://10.0.0.236/trunk@47134 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsListControlFrame.cpp | 11 +++++++++++ mozilla/layout/html/forms/src/nsListControlFrame.cpp | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index e61a6fa00e4..544b3c7e72f 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -2034,6 +2034,17 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent) } else { // NOTE: the combo box is responsible for dropping it down if (mComboboxFrame) { + nsIEventStateManager *stateManager; + if (NS_OK == mPresContext->GetEventStateManager(&stateManager)) { + nsIFrame * frame; + stateManager->GetEventTarget(&frame); + nsCOMPtr listFrame(do_QueryInterface(frame)); + if (listFrame) { + return NS_OK; + } + NS_RELEASE(stateManager); + } + PRBool isDroppedDown; mComboboxFrame->IsDroppedDown(&isDroppedDown); mComboboxFrame->ShowDropDown(!isDroppedDown); diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index e61a6fa00e4..544b3c7e72f 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -2034,6 +2034,17 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent) } else { // NOTE: the combo box is responsible for dropping it down if (mComboboxFrame) { + nsIEventStateManager *stateManager; + if (NS_OK == mPresContext->GetEventStateManager(&stateManager)) { + nsIFrame * frame; + stateManager->GetEventTarget(&frame); + nsCOMPtr listFrame(do_QueryInterface(frame)); + if (listFrame) { + return NS_OK; + } + NS_RELEASE(stateManager); + } + PRBool isDroppedDown; mComboboxFrame->IsDroppedDown(&isDroppedDown); mComboboxFrame->ShowDropDown(!isDroppedDown);