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

Added in opacity

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@13580 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-10-28 02:02:47 +00:00
parent 6cc6eed4f5
commit 89c44b8453
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
View File

@@ -400,6 +400,9 @@ public:
NS_IMETHOD GetZIndex(nsString& aZIndex)=0;
NS_IMETHOD SetZIndex(const nsString& aZIndex)=0;
NS_IMETHOD GetOpacity(nsString& aOpacity)=0;
NS_IMETHOD SetOpacity(const nsString& aOpacity)=0;
NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn)=0;
NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn)=0;
@@ -656,6 +659,8 @@ public:
NS_IMETHOD SetWordSpacing(const nsString& aWordSpacing); \
NS_IMETHOD GetZIndex(nsString& aZIndex); \
NS_IMETHOD SetZIndex(const nsString& aZIndex); \
NS_IMETHOD GetOpacity(nsString& aOpacity); \
NS_IMETHOD SetOpacity(const nsString& aOpacity); \
NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn); \
NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn); \
NS_IMETHOD SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority); \
@@ -909,6 +914,8 @@ public:
NS_IMETHOD SetWordSpacing(const nsString& aWordSpacing) { return _to##SetWordSpacing(aWordSpacing); } \
NS_IMETHOD GetZIndex(nsString& aZIndex) { return _to##GetZIndex(aZIndex); } \
NS_IMETHOD SetZIndex(const nsString& aZIndex) { return _to##SetZIndex(aZIndex); } \
NS_IMETHOD GetOpacity(nsString& aOpacity) { return _to##GetOpacity(aOpacity); } \
NS_IMETHOD SetOpacity(const nsString& aOpacity) { return _to##SetOpacity(aOpacity); } \
NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn) { return _to##GetPropertyValue(aPropertyName, aReturn); } \
NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn) { return _to##GetPropertyPriority(aPropertyName, aReturn); } \
NS_IMETHOD SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority) { return _to##SetProperty(aPropertyName, aValue, aPriority); } \

3
mozilla/dom/public/idl/css/CSSStyleDeclaration.idl
View File

@@ -131,6 +131,9 @@
attribute wstring width;
attribute wstring wordSpacing;
attribute wstring zIndex;
/* XXX: kipp was here */
attribute wstring opacity;
};

32
mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp
View File

@@ -161,7 +161,8 @@ enum CSSStyleDeclaration_slots {
CSSSTYLEDECLARATION_WIDOWS = -120,
CSSSTYLEDECLARATION_WIDTH = -121,
CSSSTYLEDECLARATION_WORDSPACING = -122,
CSSSTYLEDECLARATION_ZINDEX = -123
CSSSTYLEDECLARATION_ZINDEX = -123,
CSSSTYLEDECLARATION_OPACITY = -124
};
/***********************************************************************/
@@ -1777,6 +1778,19 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
}
break;
}
case CSSSTYLEDECLARATION_OPACITY:
{
nsAutoString prop;
if (NS_OK == a->GetOpacity(prop)) {
JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
// set the return value
*vp = STRING_TO_JSVAL(jsstring);
}
else {
return JS_FALSE;
}
break;
}
default:
{
nsAutoString prop;
@@ -3650,6 +3664,21 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
break;
}
case CSSSTYLEDECLARATION_OPACITY:
{
nsAutoString prop;
JSString *jsstring;
if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
prop.SetString(JS_GetStringChars(jsstring));
}
else {
prop.SetString((const char *)nsnull);
}
a->SetOpacity(prop);
break;
}
default:
{
nsIJSScriptObject *object;
@@ -4075,6 +4104,7 @@ static JSPropertySpec CSSStyleDeclarationProperties[] =
{"width", CSSSTYLEDECLARATION_WIDTH, JSPROP_ENUMERATE},
{"wordSpacing", CSSSTYLEDECLARATION_WORDSPACING, JSPROP_ENUMERATE},
{"zIndex", CSSSTYLEDECLARATION_ZINDEX, JSPROP_ENUMERATE},
{"opacity", CSSSTYLEDECLARATION_OPACITY, JSPROP_ENUMERATE},
{0}
};