changeset 1050:2bfebdcec3b3

Adding support for modifying caspian.css and embedded.css styling on QVGA by adding CSS style information into the embedded-qvga.css file.
author jgiles
date Wed, 16 May 2012 10:26:49 +1200
parents 533c34fbeefc
children ce2983e07daf
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css javafx-ui-controls/src/javafx/scene/control/UAStylesheetLoader.java
diffstat 2 files changed, 38 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css	Wed May 16 10:26:49 2012 +1200
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
+ *  
+ * This code is free software; you can redistribute it and/or modify it 
+ * under the terms of the GNU General Public License version 2 only, as 
+ * published by the Free Software Foundation.  Oracle designates this 
+ * particular file as subject to the "Classpath" exception as provided 
+ * by Oracle in the LICENSE file that accompanied this code. 
+ *  
+ * This code is distributed in the hope that it will be useful, but WITHOUT 
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
+ * version 2 for more details (a copy is included in the LICENSE file that 
+ * accompanied this code). 
+ *  
+ * You should have received a copy of the GNU General Public License version 
+ * 2 along with this work; if not, write to the Free Software Foundation, 
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
+ *  
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
+ * or visit www.oracle.com if you need additional information or have any 
+ * questions.
+ *                                                                              
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * CSS Styles for embedded devices that have QVGA screens. These styles either *
+ * override or supplement those in caspian.css and embedded.css (which is      *
+ * targeted at VGA screens).                                                   *
+ *                                                                             *
+ ******************************************************************************/
--- a/javafx-ui-controls/src/javafx/scene/control/UAStylesheetLoader.java	Wed May 16 08:48:51 2012 +1200
+++ b/javafx-ui-controls/src/javafx/scene/control/UAStylesheetLoader.java	Wed May 16 10:26:49 2012 +1200
@@ -65,6 +65,11 @@
                             url = SkinBase.class.getResource("caspian/embedded.css");
                             StyleManager.getInstance().addUserAgentStylesheet(url.toExternalForm());
                         }
+                        
+                        if (com.sun.javafx.Utils.isQVGAScreen()) {
+                            url = SkinBase.class.getResource("caspian/embedded-qvga.css");
+                            StyleManager.getInstance().addUserAgentStylesheet(url.toExternalForm());
+                        }
                         stylesheetLoaded = true;
                     return null;
                 }