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

fix for 46209: I overhauled nsEditor::IsEditable() to better grok the state of content for editability. r=kin; sr=sfraser; a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@96980 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com 2001-06-12 22:35:28 +00:00
parent 72d520a472
commit 078688a194
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/editor/base/nsEditor.cpp
View File

@ -3495,18 +3495,29 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
if (IsMozEditorBogusNode(aNode)) return PR_FALSE;
// we got this far, so see if it has a frame. If so, we'll edit it.
nsIFrame *resultFrame;
nsCOMPtr<nsIContent>content;
// see if it has a frame. If so, we'll edit it.
// special case for textnodes: frame must have width.
nsCOMPtr<nsIContent> content;
content = do_QueryInterface(aNode);
if (content)
{
nsIFrame *resultFrame;
nsresult result = shell->GetPrimaryFrameFor(content, &resultFrame);
if (NS_FAILED(result) || !resultFrame) // if it has no frame, it is not editable
return PR_FALSE;
return PR_TRUE;
nsCOMPtr<nsITextContent> text(do_QueryInterface(content));
if (!text)
return PR_TRUE; // not a text node; has a frame
nsFrameState fs;
resultFrame->GetFrameState(&fs);
if ((fs & NS_FRAME_IS_DIRTY)) // we can only trust width data for undirty frames
return PR_TRUE; // assume all text nodes with dirty frames are editable
nsRect rect;
resultFrame->GetRect(rect);
if (rect.width > 0)
return PR_TRUE; // text node has width
}
return PR_FALSE; // it's not a content object (???) so it's not editable
return PR_FALSE; // didn't pass any editability test
}
PRBool

21
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@ -3495,18 +3495,29 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
if (IsMozEditorBogusNode(aNode)) return PR_FALSE;
// we got this far, so see if it has a frame. If so, we'll edit it.
nsIFrame *resultFrame;
nsCOMPtr<nsIContent>content;
// see if it has a frame. If so, we'll edit it.
// special case for textnodes: frame must have width.
nsCOMPtr<nsIContent> content;
content = do_QueryInterface(aNode);
if (content)
{
nsIFrame *resultFrame;
nsresult result = shell->GetPrimaryFrameFor(content, &resultFrame);
if (NS_FAILED(result) || !resultFrame) // if it has no frame, it is not editable
return PR_FALSE;
return PR_TRUE;
nsCOMPtr<nsITextContent> text(do_QueryInterface(content));
if (!text)
return PR_TRUE; // not a text node; has a frame
nsFrameState fs;
resultFrame->GetFrameState(&fs);
if ((fs & NS_FRAME_IS_DIRTY)) // we can only trust width data for undirty frames
return PR_TRUE; // assume all text nodes with dirty frames are editable
nsRect rect;
resultFrame->GetRect(rect);
if (rect.width > 0)
return PR_TRUE; // text node has width
}
return PR_FALSE; // it's not a content object (???) so it's not editable
return PR_FALSE; // didn't pass any editability test
}
PRBool