Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed GetBackgroundColorState to get nested table and cell color, needed to make background color on toolbar correct. b=49952, r=buster

Browse Source
This commit is contained in:
cmanske%netscape.com 2000-08-31 12:44:55 +00:00
parent 3f22a1ad7c
commit 71959db2e5
2 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
editor/base/nsHTMLEditor.cpp
View File

@ -3231,16 +3231,16 @@ nsHTMLEditor::GetFontFaceState(PRBool &aMixed, nsString &outFace)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &outColor) nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &aOutColor)
{ {
aMixed = PR_TRUE; aMixed = PR_TRUE;
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
nsresult res; nsresult res;
nsAutoString colorStr; colorStr.AssignWithConversion("color"); nsAutoString colorStr; colorStr.AssignWithConversion("color");
PRBool first, any, all; PRBool first, any, all;
res = GetInlinePropertyWithAttrValue(nsIEditProperty::font, &colorStr, nsnull, first, any, all, &outColor); res = GetInlinePropertyWithAttrValue(nsIEditProperty::font, &colorStr, nsnull, first, any, all, &aOutColor);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
if (any && !all) return res; // mixed if (any && !all) return res; // mixed
if (all) if (all)
@ -3252,18 +3252,18 @@ nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &outColor)
if (!any) if (!any)
{ {
// there was no font color attrs of any kind.. // there was no font color attrs of any kind..
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
aMixed = PR_FALSE; aMixed = PR_FALSE;
} }
return res; return res;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &outColor) nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &aOutColor)
{ {
//TODO: We don't handle "mixed" correctly! //TODO: We don't handle "mixed" correctly!
aMixed = PR_FALSE; aMixed = PR_FALSE;
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
nsCOMPtr<nsIDOMElement> element; nsCOMPtr<nsIDOMElement> element;
PRInt32 selectedCount; PRInt32 selectedCount;
@ -3271,17 +3271,35 @@ nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &outColor)
nsresult res = GetSelectedOrParentTableElement(*getter_AddRefs(element), tagName, selectedCount); nsresult res = GetSelectedOrParentTableElement(*getter_AddRefs(element), tagName, selectedCount);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
// If not table or cell found, get page body nsAutoString styleName; styleName.AssignWithConversion("bgcolor");
if (!element)
while (element)
{ {
res = nsEditor::GetRootElement(getter_AddRefs(element)); // We are in a cell or selected table
res = element->GetAttribute(styleName, aOutColor);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
// Done if we have a color explicitly set
if (aOutColor.Length() > 0)
return NS_OK;
// Once we hit the body, we're done
if(nsHTMLEditUtils::IsBody(element)) return NS_OK;
// No color is set, but we need to report visible color inherited
// from nested cells/tables, so search up parent chain
nsCOMPtr<nsIDOMNode> parentNode;
res = element->GetParentNode(getter_AddRefs(parentNode));
if (NS_FAILED(res)) return res;
element = do_QueryInterface(parentNode);
} }
// If no table or cell found, get page body
res = nsEditor::GetRootElement(getter_AddRefs(element));
if (NS_FAILED(res)) return res;
if (!element) return NS_ERROR_NULL_POINTER; if (!element) return NS_ERROR_NULL_POINTER;
nsAutoString styleName; styleName.AssignWithConversion("bgcolor"); return element->GetAttribute(styleName, aOutColor);
return element->GetAttribute(styleName, outColor);
} }
NS_IMETHODIMP NS_IMETHODIMP

40
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -3231,16 +3231,16 @@ nsHTMLEditor::GetFontFaceState(PRBool &aMixed, nsString &outFace)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &outColor) nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &aOutColor)
{ {
aMixed = PR_TRUE; aMixed = PR_TRUE;
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
nsresult res; nsresult res;
nsAutoString colorStr; colorStr.AssignWithConversion("color"); nsAutoString colorStr; colorStr.AssignWithConversion("color");
PRBool first, any, all; PRBool first, any, all;
res = GetInlinePropertyWithAttrValue(nsIEditProperty::font, &colorStr, nsnull, first, any, all, &outColor); res = GetInlinePropertyWithAttrValue(nsIEditProperty::font, &colorStr, nsnull, first, any, all, &aOutColor);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
if (any && !all) return res; // mixed if (any && !all) return res; // mixed
if (all) if (all)
@ -3252,18 +3252,18 @@ nsHTMLEditor::GetFontColorState(PRBool &aMixed, nsString &outColor)
if (!any) if (!any)
{ {
// there was no font color attrs of any kind.. // there was no font color attrs of any kind..
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
aMixed = PR_FALSE; aMixed = PR_FALSE;
} }
return res; return res;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &outColor) nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &aOutColor)
{ {
//TODO: We don't handle "mixed" correctly! //TODO: We don't handle "mixed" correctly!
aMixed = PR_FALSE; aMixed = PR_FALSE;
outColor.AssignWithConversion(""); aOutColor.AssignWithConversion("");
nsCOMPtr<nsIDOMElement> element; nsCOMPtr<nsIDOMElement> element;
PRInt32 selectedCount; PRInt32 selectedCount;
@ -3271,17 +3271,35 @@ nsHTMLEditor::GetBackgroundColorState(PRBool &aMixed, nsString &outColor)
nsresult res = GetSelectedOrParentTableElement(*getter_AddRefs(element), tagName, selectedCount); nsresult res = GetSelectedOrParentTableElement(*getter_AddRefs(element), tagName, selectedCount);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
// If not table or cell found, get page body nsAutoString styleName; styleName.AssignWithConversion("bgcolor");
if (!element)
while (element)
{ {
res = nsEditor::GetRootElement(getter_AddRefs(element)); // We are in a cell or selected table
res = element->GetAttribute(styleName, aOutColor);
if (NS_FAILED(res)) return res; if (NS_FAILED(res)) return res;
// Done if we have a color explicitly set
if (aOutColor.Length() > 0)
return NS_OK;
// Once we hit the body, we're done
if(nsHTMLEditUtils::IsBody(element)) return NS_OK;
// No color is set, but we need to report visible color inherited
// from nested cells/tables, so search up parent chain
nsCOMPtr<nsIDOMNode> parentNode;
res = element->GetParentNode(getter_AddRefs(parentNode));
if (NS_FAILED(res)) return res;
element = do_QueryInterface(parentNode);
} }
// If no table or cell found, get page body
res = nsEditor::GetRootElement(getter_AddRefs(element));
if (NS_FAILED(res)) return res;
if (!element) return NS_ERROR_NULL_POINTER; if (!element) return NS_ERROR_NULL_POINTER;
nsAutoString styleName; styleName.AssignWithConversion("bgcolor"); return element->GetAttribute(styleName, aOutColor);
return element->GetAttribute(styleName, outColor);
} }
NS_IMETHODIMP NS_IMETHODIMP