зеркало из https://github.com/mozilla/pjs.git
Fix for bug 274808. Crash when dragging onto a tree [@ nsXULTreeBuilder::GetTemplateActionCellFor ]
r=varga sr=bryner patch by Neil Deakin <enndeakin@sympatico.ca>
This commit is contained in:
Родитель
216b26fb6b
Коммит
876c4276af
|
@ -1470,6 +1470,8 @@ nsXULTreeBuilder::GetTemplateActionCellFor(PRInt32 aRow,
|
|||
{
|
||||
*aResult = nsnull;
|
||||
|
||||
if (!aCol) return NS_ERROR_INVALID_ARG;
|
||||
|
||||
nsCOMPtr<nsIContent> row;
|
||||
GetTemplateActionRowFor(aRow, getter_AddRefs(row));
|
||||
if (row) {
|
||||
|
|
|
@ -3101,12 +3101,14 @@ nsTreeBodyFrame::PaintDropFeedback(const nsRect& aDropFeedbackRect,
|
|||
|
||||
currX += mIndentation * level;
|
||||
|
||||
nsStyleContext* twistyContext = GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty);
|
||||
nsRect twistySize = GetImageSize(mSlots->mDropRow, primaryCol, PR_TRUE, twistyContext);
|
||||
nsMargin twistyMargin;
|
||||
twistyContext->GetStyleMargin()->GetMargin(twistyMargin);
|
||||
twistySize.Inflate(twistyMargin);
|
||||
currX += twistySize.width;
|
||||
if (primaryCol){
|
||||
nsStyleContext* twistyContext = GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty);
|
||||
nsRect twistySize = GetImageSize(mSlots->mDropRow, primaryCol, PR_TRUE, twistyContext);
|
||||
nsMargin twistyMargin;
|
||||
twistyContext->GetStyleMargin()->GetMargin(twistyMargin);
|
||||
twistySize.Inflate(twistyMargin);
|
||||
currX += twistySize.width;
|
||||
}
|
||||
|
||||
const nsStylePosition* stylePosition = feedbackContext->GetStylePosition();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче