[richfaces-svn-commits] JBoss Rich Faces SVN: r9022 - in trunk/ui/modal-panel/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
Author: abelevich
Date: 2008-06-12 12:19:06 -0400 (Thu, 12 Jun 2008)
New Revision: 9022
Modified:
trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
Log:
http://jira.jboss.com/jira/browse/RF-3434
Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
===================================================================
---
trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2008-06-12
15:53:36 UTC (rev 9021)
+++
trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2008-06-12
16:19:06 UTC (rev 9022)
@@ -51,8 +51,6 @@
/**
* Shadow depth.
*/
- private static final int SHADOW_DEPTH = 4;
-
private boolean resizeable = true;
private boolean resizeableSet = false;
@@ -97,35 +95,27 @@
}
public String getShadowStyle() {
- String shadow = (String) getAttributes().get("shadowDepth");
- if (shadow == null) {
- shadow = Integer.toString(SHADOW_DEPTH);
+ String shadow = (String) getAttributes().get("shadowDepth");
+ String shadowStyle ="";
+ if (shadow != null) {
+ shadowStyle = "top: " + shadow + "px; left: " + shadow +
"px;";
}
-
- String shadowStyle = "top: " + shadow + "px; left: " +
shadow + "px;";
-
- FacesContext context = FacesContext.getCurrentInstance();
- if (null == context)
- return shadowStyle;
-
+
String opacity = (String) getAttributes().get("shadowOpacity");
String filterOpacity;
- if (null == opacity) {
- Skin skin = SkinFactory.getInstance().getSkin(context);
- opacity = (String) skin.getParameter(context, "shadowOpacity");
+ if (opacity != null) {
+ try {
+ Double op = Double.valueOf(opacity);
+ filterOpacity = Integer.toString(op.intValue() * 10);
+ opacity = Double.toString(op.doubleValue() / 10);
+ } catch (Exception e) {
+ // illegal opacity
+ return "";
+ }
+ shadowStyle += " opacity:" + opacity
+ + "; filter:alpha(opacity=" + filterOpacity +
");";
}
- try {
- Double op = Double.valueOf(opacity);
- filterOpacity = Integer.toString(op.intValue() * 10);
- opacity = Double.toString(op.doubleValue() / 10);
- } catch (Exception e) {
- // illegal opacity
- return ";";
- }
- shadowStyle += " opacity:" + opacity
- + "; filter:alpha(opacity=" + filterOpacity + ");";
-
return shadowStyle;
}
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
===================================================================
---
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-06-12
15:53:36 UTC (rev 9021)
+++
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-06-12
16:19:06 UTC (rev 9022)
@@ -104,6 +104,10 @@
width: 100%;
border : 1px solid;
z-index: 1;
+ top: 4px;
+ left: 4px;
+ filter:alpha(opacity=10);
+ opacity: 0.1;
}
]]>
@@ -138,7 +142,6 @@
<u:selector name=".dr-mpnl-shadow">
<u:style name="background-color" skin="shadowBackgroundColor"
/>
<u:style name="border-color" skin="shadowBackgroundColor"
/>
- <u:style name="opacity" skin="shadowOpacity" />
</u:selector>
</f:template>