Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set the clickCoubt appropriately on MouseUp so onclicks are sent or disabled correctly

Browse Source 
b=40382 , r=joki
This commit is contained in:
rods%netscape.com 2000-05-26 23:31:25 +00:00
parent 40dc18d415
commit 0189750b5f
3 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
layout/forms/nsListControlFrame.cpp
View File

@ -60,6 +60,7 @@
#include "nsIDOMEventTarget.h"
#include "nsISelectElement.h"
#include "nsIPrivateDOMEvent.h"
static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID);
static NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID);
@ -2569,7 +2570,7 @@ nsListControlFrame::SyncViewWithFrame(nsIPresContext* aPresContext)
view->GetDimensions(&width, &height);
if (width != mRect.width || height != mRect.height) {
viewManager->ResizeView(view, mRect.width, mRect.height);
//viewManager->ResizeView(view, mRect.width, mRect.height);
}
nscoord x;
nscoord y;
@ -2803,6 +2804,20 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
}
if (IsInDropDownMode() == PR_TRUE) {
// XXX This is a bit of a hack, but.....
// But the idea here is to make sure you get an "onclick" event when you mouse
// down on the select and the drag over an option and let go
// And then NOT get an "onclick" event when when you click down on the select
// and then up outside of the select
// the EventStateManager tracks the content of the mouse down and the mouse up
// to make sure they are the same, and the onclick is sent in the PostHandleEvent
// depeneding on whether the clickCount is non-zero.
// So we cheat here by either setting or unsetting the clcikCount in the native event
// so the right thing happens for the onclick event
nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aMouseEvent));
nsMouseEvent * mouseEvent;
privateEvent->GetInternalNSEvent((nsEvent**)&mouseEvent);
if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, mOldSelectedIndex, mSelectedIndex))) {
REFLOW_DEBUG_MSG2(">>>>>> Found Index: %d", mSelectedIndex);
if (kNothingSelected != mSelectedIndex) {
@ -2811,6 +2826,10 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
if (mComboboxFrame) {
mComboboxFrame->ListWasSelected(mPresContext);
}
mouseEvent->clickCount = 1;
} else {
// the click was out side of the select or its dropdown
mouseEvent->clickCount = 0;
}
} else {
REFLOW_DEBUG_MSG(">>>>>> Didn't find");

19
layout/html/forms/src/nsGfxListControlFrame.cpp
View File

@ -60,6 +60,7 @@
#include "nsISelectElement.h"
#include "nsIScrollableFrame.h"
#include "nsIPrivateDOMEvent.h"
// included for view scrolling
@ -3007,6 +3008,20 @@ nsGfxListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
}
if (IsInDropDownMode() == PR_TRUE) {
// XXX This is a bit of a hack, but.....
// But the idea here is to make sure you get an "onclick" event when you mouse
// down on the select and the drag over an option and let go
// And then NOT get an "onclick" event when when you click down on the select
// and then up outside of the select
// the EventStateManager tracks the content of the mouse down and the mouse up
// to make sure they are the same, and the onclick is sent in the PostHandleEvent
// depeneding on whether the clickCount is non-zero.
// So we cheat here by either setting or unsetting the clcikCount in the native event
// so the right thing happens for the onclick event
nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aMouseEvent));
nsMouseEvent * mouseEvent;
privateEvent->GetInternalNSEvent((nsEvent**)&mouseEvent);
if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, mOldSelectedIndex, mSelectedIndex))) {
if (kNothingSelected != mSelectedIndex) {
SetContentSelected(mSelectedIndex, PR_TRUE);
@ -3014,6 +3029,10 @@ nsGfxListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
if (mComboboxFrame) {
mComboboxFrame->ListWasSelected(mPresContext);
}
mouseEvent->clickCount = 1;
} else {
// the click was out side of the select or its dropdown
mouseEvent->clickCount = 0;
}
} else if (mButtonDown) {
mButtonDown = PR_FALSE;

21
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -60,6 +60,7 @@
#include "nsIDOMEventTarget.h"
#include "nsISelectElement.h"
#include "nsIPrivateDOMEvent.h"
static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID);
static NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID);
@ -2569,7 +2570,7 @@ nsListControlFrame::SyncViewWithFrame(nsIPresContext* aPresContext)
view->GetDimensions(&width, &height);
if (width != mRect.width || height != mRect.height) {
viewManager->ResizeView(view, mRect.width, mRect.height);
//viewManager->ResizeView(view, mRect.width, mRect.height);
}
nscoord x;
nscoord y;
@ -2803,6 +2804,20 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
}
if (IsInDropDownMode() == PR_TRUE) {
// XXX This is a bit of a hack, but.....
// But the idea here is to make sure you get an "onclick" event when you mouse
// down on the select and the drag over an option and let go
// And then NOT get an "onclick" event when when you click down on the select
// and then up outside of the select
// the EventStateManager tracks the content of the mouse down and the mouse up
// to make sure they are the same, and the onclick is sent in the PostHandleEvent
// depeneding on whether the clickCount is non-zero.
// So we cheat here by either setting or unsetting the clcikCount in the native event
// so the right thing happens for the onclick event
nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(aMouseEvent));
nsMouseEvent * mouseEvent;
privateEvent->GetInternalNSEvent((nsEvent**)&mouseEvent);
if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, mOldSelectedIndex, mSelectedIndex))) {
REFLOW_DEBUG_MSG2(">>>>>> Found Index: %d", mSelectedIndex);
if (kNothingSelected != mSelectedIndex) {
@ -2811,6 +2826,10 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
if (mComboboxFrame) {
mComboboxFrame->ListWasSelected(mPresContext);
}
mouseEvent->clickCount = 1;
} else {
// the click was out side of the select or its dropdown
mouseEvent->clickCount = 0;
}
} else {
REFLOW_DEBUG_MSG(">>>>>> Didn't find");