Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

122057 - springloaded folders trigger too easily

Browse Source 
r=varga@utcru.sk, sr=ben


git-svn-id: svn://10.0.0.236/trunk@113406 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dean_tessman%hotmail.com
2002-02-01 06:36:28 +00:00
parent bcf3696b25
commit d20cb76545
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp
View File

@@ -304,7 +304,7 @@ nsOutlinerBodyFrame::nsOutlinerBodyFrame(nsIPresShell* aPresShell)
:nsLeafBoxFrame(aPresShell), mPresContext(nsnull), mOutlinerBoxObject(nsnull), mImageCache(nsnull),
mColumns(nsnull), mScrollbar(nsnull), mTopRowIndex(0), mRowHeight(0), mIndentation(0), mStringWidth(-1),
mFocused(PR_FALSE), mColumnsDirty(PR_TRUE), mDropAllowed(PR_FALSE), mHasFixedRowCount(PR_FALSE),
mVerticalOverflow(PR_FALSE), mDropRow(-1), mDropOrient(-1), mOpenTimer(nsnull), mOpenTimerRow(-1)
mVerticalOverflow(PR_FALSE), mDropRow(-1), mDropOrient(-1), mOpenTimer(nsnull)
{
NS_NewISupportsArray(getter_AddRefs(mScratchArray));
}
@@ -2990,7 +2990,6 @@ nsOutlinerBodyFrame::OnDragExit(nsIDOMEvent* aEvent)
if (mOpenTimer) {
mOpenTimer->Cancel();
mOpenTimer = nsnull;
mOpenTimerRow = -1;
}
return NS_OK;
@@ -3032,11 +3031,10 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
InvalidatePrimaryCell(mDropRow);
}
if (mOpenTimer && newRow != mOpenTimerRow) {
if (mOpenTimer) {
// timer is active but for a different row than the current one - kill it
mOpenTimer->Cancel();
mOpenTimer = nsnull;
mOpenTimerRow = -1;
}
// cache the new row and orientation regardless so we can check if it changed
@@ -3046,7 +3044,7 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
mDropAllowed = PR_FALSE;
if (mDropRow >= 0) {
if (!mOpenTimer) {
if (!mOpenTimer && mDropOrient == nsIOutlinerView::inDropOn) {
// either there wasn't a timer running or it was just killed above.
// if over a folder, start up a timer to open the folder.
PRBool isContainer = PR_FALSE;
@@ -3056,7 +3054,6 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
mView->IsContainerOpen(mDropRow, &isOpen);
if (!isOpen) {
// this node isn't expanded - set a timer to expand it
mOpenTimerRow = mDropRow;
mOpenTimer = do_CreateInstance("@mozilla.org/timer;1");
mOpenTimer->Init(this, 1000, NS_PRIORITY_HIGHEST);
}
@@ -3287,9 +3284,7 @@ nsOutlinerBodyFrame::Notify(nsITimer* aTimer)
// open the node
mOpenTimer->Cancel();
mOpenTimer = nsnull;
if (mOpenTimerRow >= 0) {
mView->ToggleOpenState(mOpenTimerRow);
mOpenTimerRow = -1;
}
if (mDropRow >= 0)
mView->ToggleOpenState(mDropRow);
}
}

15
mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
View File

@@ -304,7 +304,7 @@ nsOutlinerBodyFrame::nsOutlinerBodyFrame(nsIPresShell* aPresShell)
:nsLeafBoxFrame(aPresShell), mPresContext(nsnull), mOutlinerBoxObject(nsnull), mImageCache(nsnull),
mColumns(nsnull), mScrollbar(nsnull), mTopRowIndex(0), mRowHeight(0), mIndentation(0), mStringWidth(-1),
mFocused(PR_FALSE), mColumnsDirty(PR_TRUE), mDropAllowed(PR_FALSE), mHasFixedRowCount(PR_FALSE),
mVerticalOverflow(PR_FALSE), mDropRow(-1), mDropOrient(-1), mOpenTimer(nsnull), mOpenTimerRow(-1)
mVerticalOverflow(PR_FALSE), mDropRow(-1), mDropOrient(-1), mOpenTimer(nsnull)
{
NS_NewISupportsArray(getter_AddRefs(mScratchArray));
}
@@ -2990,7 +2990,6 @@ nsOutlinerBodyFrame::OnDragExit(nsIDOMEvent* aEvent)
if (mOpenTimer) {
mOpenTimer->Cancel();
mOpenTimer = nsnull;
mOpenTimerRow = -1;
}
return NS_OK;
@@ -3032,11 +3031,10 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
InvalidatePrimaryCell(mDropRow);
}
if (mOpenTimer && newRow != mOpenTimerRow) {
if (mOpenTimer) {
// timer is active but for a different row than the current one - kill it
mOpenTimer->Cancel();
mOpenTimer = nsnull;
mOpenTimerRow = -1;
}
// cache the new row and orientation regardless so we can check if it changed
@@ -3046,7 +3044,7 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
mDropAllowed = PR_FALSE;
if (mDropRow >= 0) {
if (!mOpenTimer) {
if (!mOpenTimer && mDropOrient == nsIOutlinerView::inDropOn) {
// either there wasn't a timer running or it was just killed above.
// if over a folder, start up a timer to open the folder.
PRBool isContainer = PR_FALSE;
@@ -3056,7 +3054,6 @@ nsOutlinerBodyFrame::OnDragOver(nsIDOMEvent* aEvent)
mView->IsContainerOpen(mDropRow, &isOpen);
if (!isOpen) {
// this node isn't expanded - set a timer to expand it
mOpenTimerRow = mDropRow;
mOpenTimer = do_CreateInstance("@mozilla.org/timer;1");
mOpenTimer->Init(this, 1000, NS_PRIORITY_HIGHEST);
}
@@ -3287,9 +3284,7 @@ nsOutlinerBodyFrame::Notify(nsITimer* aTimer)
// open the node
mOpenTimer->Cancel();
mOpenTimer = nsnull;
if (mOpenTimerRow >= 0) {
mView->ToggleOpenState(mOpenTimerRow);
mOpenTimerRow = -1;
}
if (mDropRow >= 0)
mView->ToggleOpenState(mDropRow);
}
}