mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Improvements to tree scrolling.

This commit is contained in:
hyatt%netscape.com 1999-08-30 00:00:31 +00:00
Родитель 2e33d40c03
Коммит ef1b8514bd
6 изменённых файлов: 162 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
layout/xul/base/src/nsTreeFrame.cpp
Просмотреть файл

@ -60,7 +60,7 @@ NS_NewTreeFrame (nsIFrame** aNewFrame)
// Constructor
nsTreeFrame::nsTreeFrame()
:nsTableFrame(),mSlatedForReflow(PR_FALSE), mTwistyListener(nsnull) { }
:nsTableFrame(),mSlatedForReflow(PR_FALSE), mTwistyListener(nsnull), mGeneration(0), mMaxGeneration(0) { }
// Destructor
nsTreeFrame::~nsTreeFrame()
@ -304,6 +304,19 @@ nsTreeFrame::Reflow(nsIPresContext& aPresContext,
nsReflowStatus& aStatus)
{
mSlatedForReflow = PR_FALSE;
nsRect rect;
GetRect(rect);
if (rect.width != aReflowState.mComputedWidth && aReflowState.reason == eReflowReason_Resize) {
// We're doing a resize and changing the width of the table. All rows must
// reflow. Reset our generation.
mGeneration = 0;
}
else {
++mGeneration;
mMaxGeneration = mGeneration;
}
nsresult rv = nsTableFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
if (aReflowState.mComputedWidth != NS_UNCONSTRAINEDSIZE)
@ -315,6 +328,9 @@ nsTreeFrame::Reflow(nsIPresContext& aPresContext,
aReflowState.mComputedBorderPadding.top + aReflowState.mComputedBorderPadding.bottom;
aDesiredSize.ascent = aDesiredSize.height;
if (mGeneration == 0)
mGeneration = mMaxGeneration;
return rv;
}
@ -350,7 +366,6 @@ nsTreeFrame::DidReflow(nsIPresContext& aPresContext,
NS_RELEASE(reflowCmd);
}
}
return rv;
}

5
layout/xul/base/src/nsTreeFrame.h
Просмотреть файл

@ -66,7 +66,8 @@ public:
nsDidReflowStatus aStatus);
void WillNeedDirtyReflow() { mNeedsDirtyReflow = PR_TRUE; };
PRInt32 GetCurrentGeneration() { return mGeneration; };
protected:
nsTreeFrame();
virtual ~nsTreeFrame();
@ -75,5 +76,7 @@ protected: // Data Members
PRBool mSlatedForReflow; // If set, don't waste time scheduling excess reflows.
nsTreeTwistyListener* mTwistyListener;
PRBool mNeedsDirtyReflow;
PRInt32 mGeneration;
PRInt32 mMaxGeneration;
}; // class nsTreeFrame

43
layout/xul/base/src/nsTreeRowFrame.cpp
Просмотреть файл

@ -59,7 +59,7 @@ NS_NewTreeRowFrame (nsIFrame** aNewFrame)
// Constructor
nsTreeRowFrame::nsTreeRowFrame()
:nsTableRowFrame(), mIsHeader(PR_FALSE)
:nsTableRowFrame(), mIsHeader(PR_FALSE),mGeneration(0)
{ }
// Destructor
@ -122,7 +122,16 @@ nsTreeRowFrame::Init(nsIPresContext& aPresContext,
GetView(&view);
view->SetContentTransparency(PR_TRUE);
}
else mIsHeader = PR_FALSE;
else
{
mIsHeader = PR_FALSE;
// Determine the row's generation.
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(aParent, tableFrame);
nsTreeFrame* treeFrame = (nsTreeFrame*)tableFrame;
mGeneration = treeFrame->GetCurrentGeneration();
}
}
}
@ -174,3 +183,33 @@ nsTreeRowFrame::DraggingHeader()
return PR_FALSE;
}
NS_IMETHODIMP
nsTreeRowFrame::Reflow(nsIPresContext& aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
if (aReflowState.reason != eReflowReason_Incremental) {
// Determine the row's generation.
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(this, tableFrame);
nsTreeFrame* treeFrame = (nsTreeFrame*)tableFrame;
PRInt32 currGeneration = treeFrame->GetCurrentGeneration();
if (currGeneration > mGeneration) {
nsRect rect;
GetRect(rect);
aDesiredSize.width = rect.width;
aDesiredSize.height = rect.height;
aStatus = NS_FRAME_COMPLETE;
return NS_OK;
}
}
/* static int i = 0;
i++;
printf("Full row reflow! Number %d\n", i);
*/
return nsTableRowFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
}

6
layout/xul/base/src/nsTreeRowFrame.h
Просмотреть файл

@ -35,6 +35,11 @@ public:
nsReflowStatus& aStatus,
nsIFrame * aNextFrame);
NS_IMETHOD Reflow(nsIPresContext& aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
@ -50,4 +55,5 @@ protected:
protected: // Data Members
PRBool mIsHeader;
PRInt32 mGeneration;
}; // class nsTreeRowFrame

119
layout/xul/base/src/nsTreeRowGroupFrame.cpp
Просмотреть файл

@ -19,6 +19,7 @@
#include "nsCOMPtr.h"
#include "nsXULAtoms.h"
#include "nsHTMLAtoms.h"
#include "nsINameSpaceManager.h"
#include "nsIFrameReflow.h"
#include "nsTreeFrame.h"
@ -107,7 +108,7 @@ nsTreeRowGroupFrame::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return nsTableRowGroupFrame::QueryInterface(aIID, aInstancePtr);
}
void nsTreeRowGroupFrame::DestroyRows(nsIPresContext& aPresContext, PRInt32& rowsToLose)
void nsTreeRowGroupFrame::DestroyRows(nsTableFrame* aTableFrame, nsIPresContext& aPresContext, PRInt32& rowsToLose)
{
// We need to destroy frames until our row count has been properly
// reduced. A reflow will then pick up and create the new frames.
@ -122,7 +123,7 @@ void nsTreeRowGroupFrame::DestroyRows(nsIPresContext& aPresContext, PRInt32& row
if ((rowGroupCount - rowsToLose) > 0) {
// The row group will destroy as many rows as it can, and it will
// modify rowsToLose.
((nsTreeRowGroupFrame*)childFrame)->DestroyRows(aPresContext, rowsToLose);
((nsTreeRowGroupFrame*)childFrame)->DestroyRows(aTableFrame, aPresContext, rowsToLose);
return;
}
else rowsToLose -= rowGroupCount;
@ -131,6 +132,10 @@ void nsTreeRowGroupFrame::DestroyRows(nsIPresContext& aPresContext, PRInt32& row
{
// Lost a row.
rowsToLose--;
// Remove this row from our cell map.
nsTableRowFrame* rowFrame = (nsTableRowFrame*)childFrame;
aTableFrame->RemoveRowFromMap(rowFrame, rowFrame->GetRowIndex());
}
nsIFrame* nextFrame;
@ -141,7 +146,7 @@ void nsTreeRowGroupFrame::DestroyRows(nsIPresContext& aPresContext, PRInt32& row
}
}
void nsTreeRowGroupFrame::ReverseDestroyRows(nsIPresContext& aPresContext, PRInt32& rowsToLose)
void nsTreeRowGroupFrame::ReverseDestroyRows(nsTableFrame* aTableFrame, nsIPresContext& aPresContext, PRInt32& rowsToLose)
{
// We need to destroy frames until our row count has been properly
// reduced. A reflow will then pick up and create the new frames.
@ -156,7 +161,7 @@ void nsTreeRowGroupFrame::ReverseDestroyRows(nsIPresContext& aPresContext, PRInt
if ((rowGroupCount - rowsToLose) > 0) {
// The row group will destroy as many rows as it can, and it will
// modify rowsToLose.
((nsTreeRowGroupFrame*)childFrame)->ReverseDestroyRows(aPresContext, rowsToLose);
((nsTreeRowGroupFrame*)childFrame)->ReverseDestroyRows(aTableFrame, aPresContext, rowsToLose);
return;
}
else rowsToLose -= rowGroupCount;
@ -165,6 +170,9 @@ void nsTreeRowGroupFrame::ReverseDestroyRows(nsIPresContext& aPresContext, PRInt
{
// Lost a row.
rowsToLose--;
// Remove this row from our cell map.
nsTableRowFrame* rowFrame = (nsTableRowFrame*)childFrame;
aTableFrame->RemoveRowFromMap(rowFrame, rowFrame->GetRowIndex());
}
nsIFrame* prevFrame;
@ -357,8 +365,14 @@ nsTreeRowGroupFrame::FindPreviousRowContent(PRInt32& aDelta, nsIContent* aUpward
}
}
// We didn't find it here. We need to go up to our parent, using ourselves as a hint.
FindPreviousRowContent(aDelta, parentContent, nsnull, aResult);
nsCOMPtr<nsIAtom> tag;
parentContent->GetTag(*getter_AddRefs(tag));
if (tag && tag.get() == nsXULAtoms::tree) {
// Hopeless. It ain't in there.
return;
}
else // We didn't find it here. We need to go up to our parent, using ourselves as a hint.
FindPreviousRowContent(aDelta, parentContent, nsnull, aResult);
// Bail. There's nothing else we can do.
}
@ -429,7 +443,7 @@ nsTreeRowGroupFrame::PositionChanged(nsIPresContext& aPresContext, PRInt32 aOldI
PRInt32 loseRows = delta;
if (aNewIndex > aOldIndex) {
// Figure out how many rows we have to lose off the top.
DestroyRows(aPresContext, loseRows);
DestroyRows(tableFrame, aPresContext, loseRows);
}
else {
// Get our first row content.
@ -437,7 +451,7 @@ nsTreeRowGroupFrame::PositionChanged(nsIPresContext& aPresContext, PRInt32 aOldI
GetFirstRowContent(getter_AddRefs(rowContent));
// Figure out how many rows we have to lose off the bottom.
ReverseDestroyRows(aPresContext, loseRows);
ReverseDestroyRows(tableFrame, aPresContext, loseRows);
// Now that we've lost some rows, we need to create a
// content chain that provides a hint for moving forward.
@ -452,16 +466,13 @@ nsTreeRowGroupFrame::PositionChanged(nsIPresContext& aPresContext, PRInt32 aOldI
// Remove the scrollbar first.
mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, this);
mFrames.DestroyFrames(aPresContext);
tableFrame->InvalidateCellMap();
nsCOMPtr<nsIContent> topRowContent;
FindRowContentAtIndex(aNewIndex, mContent, getter_AddRefs(topRowContent));
if (topRowContent)
ConstructContentChain(topRowContent);
}
// Invalidate the cell map and column cache.
tableFrame->InvalidateCellMap();
tableFrame->InvalidateColumnCache();
mTopFrame = mBottomFrame = nsnull; // Make sure everything is cleared out.
// Force a reflow.
@ -876,6 +887,9 @@ nsTreeRowGroupFrame::GetFirstFrameForReflow(nsIPresContext& aPresContext)
}
if (startContent) {
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(this, tableFrame);
PRBool isAppend = (mLinkupFrame == nsnull);
mFrameConstructor->CreateTreeWidgetContent(&aPresContext, this, nsnull, startContent,
@ -884,17 +898,46 @@ nsTreeRowGroupFrame::GetFirstFrameForReflow(nsIPresContext& aPresContext)
// XXX Can be optimized if we detect that we're appending a row.
// Also the act of appending or inserting a row group is harmless.
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(this, tableFrame);
nsTreeFrame* treeFrame = (nsTreeFrame*)tableFrame;
treeFrame->WillNeedDirtyReflow();
//printf("Created a frame\n");
mBottomFrame = mTopFrame;
const nsStyleDisplay *rowDisplay;
mTopFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
if (NS_STYLE_DISPLAY_TABLE_ROW == rowDisplay->mDisplay) {
DidAppendRow((nsTableRowFrame*)mTopFrame);
nsCOMPtr<nsIContent> rowContent;
mTopFrame->GetContent(getter_AddRefs(rowContent));
/*nsCOMPtr<nsIContent> cellContent;
rowContent->ChildAt(0, *getter_AddRefs(cellContent));
nsString value;
cellContent->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::value, value);
char namebuf[150];
namebuf[0] = 0;
value.ToCString(namebuf, sizeof(namebuf));
printf("Created a first row: %s\n", namebuf);
*/
nsCOMPtr<nsIContent> topRowContent;
PRInt32 delta = 1;
FindPreviousRowContent(delta, rowContent, nsnull, getter_AddRefs(topRowContent));
if (!topRowContent) {
DidAppendRow((nsTableRowFrame*)mTopFrame);
}
else {
// Retrieve the primary frame.
nsCOMPtr<nsIPresShell> shell;
aPresContext.GetShell(getter_AddRefs(shell));
nsIFrame* result = nsnull;
shell->GetPrimaryFrameFor(topRowContent, &result);
if (!result) {
DidAppendRow((nsTableRowFrame*)mTopFrame);
}
else {
// We have a primary frame. Get its row index. We're equal to that + 1.
nsTableRowFrame* rowFrame = (nsTableRowFrame*)result;
PRInt32 rowIndex = rowFrame->GetRowIndex();
rowIndex++;
tableFrame->InsertRowIntoMap((nsTableRowFrame*)mTopFrame, rowIndex);
}
}
}
else if (NS_STYLE_DISPLAY_TABLE_ROW_GROUP==rowDisplay->mDisplay && mContentChain) {
// We have just instantiated a row group, and we have a content chain. This
@ -904,7 +947,7 @@ nsTreeRowGroupFrame::GetFirstFrameForReflow(nsIPresContext& aPresContext)
}
SetContentChain(nsnull);
//return mTopFrame;
return mTopFrame;
}
return nsnull;
@ -946,6 +989,9 @@ nsTreeRowGroupFrame::GetNextFrameForReflow(nsIPresContext& aPresContext, nsIFram
mContent->IndexOf(prevContent, i);
mContent->ChildCount(childCount);
if (i+1 < childCount) {
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(this, tableFrame);
// There is a content node that wants a frame.
nsCOMPtr<nsIContent> nextContent;
mContent->ChildAt(i+1, *getter_AddRefs(nextContent));
@ -961,17 +1007,35 @@ nsTreeRowGroupFrame::GetNextFrameForReflow(nsIPresContext& aPresContext, nsIFram
// XXX Can be optimized if we detect that we're appending a row to the end of the tree.
// Also the act of appending or inserting a row group is harmless.
const nsStyleDisplay *rowDisplay;
(*aResult)->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
if (NS_STYLE_DISPLAY_TABLE_ROW == rowDisplay->mDisplay) {
DidAppendRow((nsTableRowFrame*)(*aResult));
nsCOMPtr<nsIContent> topRowContent;
PRInt32 delta = 1;
FindPreviousRowContent(delta, nextContent, nsnull, getter_AddRefs(topRowContent));
if (!topRowContent) {
DidAppendRow((nsTableRowFrame*)(*aResult));
}
else {
// Retrieve the primary frame.
nsCOMPtr<nsIPresShell> shell;
aPresContext.GetShell(getter_AddRefs(shell));
nsIFrame* result = nsnull;
shell->GetPrimaryFrameFor(topRowContent, &result);
if (!result) {
DidAppendRow((nsTableRowFrame*)(*aResult));
}
else {
// We have a primary frame. Get its row index. We're equal to that + 1.
nsTableRowFrame* rowFrame = (nsTableRowFrame*)result;
PRInt32 rowIndex = rowFrame->GetRowIndex();
rowIndex++;
tableFrame->InsertRowIntoMap((nsTableRowFrame*)(*aResult), rowIndex);
}
}
}
nsTableFrame* tableFrame;
nsTableFrame::GetTableFrame(this, tableFrame);
nsTreeFrame* treeFrame = (nsTreeFrame*)tableFrame;
treeFrame->WillNeedDirtyReflow();
*aResult = nsnull;
}
}
@ -1021,6 +1085,7 @@ PRBool nsTreeRowGroupFrame::ContinueReflow(nsIPresContext& aPresContext, nscoord
mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, currFrame);
mFrames.DestroyFrame(aPresContext, currFrame);
currFrame = nextFrame;
//printf("Nuked one off the end.\n");
}
}
return PR_FALSE;

4
layout/xul/base/src/nsTreeRowGroupFrame.h
Просмотреть файл

@ -81,8 +81,8 @@ protected:
virtual PRBool RowGroupReceivesExcessSpace();
void DestroyRows(nsIPresContext& aPresContext, PRInt32& rowsToLose);
void ReverseDestroyRows(nsIPresContext& aPresContext, PRInt32& rowsToLose);
void DestroyRows(nsTableFrame* aTableFrame, nsIPresContext& aPresContext, PRInt32& rowsToLose);
void ReverseDestroyRows(nsTableFrame* aTableFrame, nsIPresContext& aPresContext, PRInt32& rowsToLose);
NS_IMETHOD ReflowBeforeRowLayout(nsIPresContext& aPresContext,
nsHTMLReflowMetrics& aDesiredSize,