Fixed issue with cn1-source-dpi=0.

shannah · Mar 29, 2017 · 188dffb · 188dffb
1 parent 11f049a
commit 188dffb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/CN1CSSCompiler/src/com/codename1/ui/css/CN1CSSCompileTask.java b/CN1CSSCompiler/src/com/codename1/ui/css/CN1CSSCompileTask.java
@@ -147,6 +147,8 @@ public void execute() throws BuildException {
                 String maxMemory = getProject().getProperty("cn1css.max.memory");
                 if (maxMemory != null) {
                     javaTask.setMaxmemory("4096m");
+                } else {
+                    javaTask.setMaxmemory(maxMemory);
                 }
 
                 Argument arg = javaTask.createArg();

diff --git a/CN1CSSCompiler/src/com/codename1/ui/css/CSSTheme.java b/CN1CSSCompiler/src/com/codename1/ui/css/CSSTheme.java
@@ -1938,14 +1938,28 @@ public Image getBackgroundImage(Map<String,LexicalUnit> styles, ScaledUnit bgIma
             int[] dpis = getDpi(encImg);
             if (styles.containsKey("cn1-source-dpi")) {
                 //System.out.println("Using cn1-source-dpi "+styles.get("cn1-source-dpi").getFloatValue());
-                resm.targetDensity = getDensityForDpi(((ScaledUnit)styles.get("cn1-source-dpi")).getNumericValue());
+                double densityVal = ((ScaledUnit)styles.get("cn1-source-dpi")).getNumericValue();
+                if (Math.abs(densityVal) < 0.5) {
+                    resm.targetDensity = 0;
+                } else {
+                    resm.targetDensity = getDensityForDpi(densityVal);
+                }
             } else if (dpis[0] > 0) {
                 resm.targetDensity = getImageDensity(encImg);
             } else {
 
                 resm.targetDensity = getDensityForDpi(bgImage.dpi);
             }
 
+            if (styles.containsKey("cn1-densities")) {
+                ScaledUnit densities = (ScaledUnit)styles.get("cn1-densities");
+                if (densities.getLexicalUnitType() == LexicalUnit.SAC_IDENT && "none".equals(densities.getStringValue())) {
+                    // Not a multi-image
+                    resm.setMultiImage(false);
+
+                }
+            }
+
             //System.out.println("Target density for image is "+resm.targetDensity);
 
             //System.out.println("Loading image from "+url+" with density "+resm.targetDensity);

diff --git a/CN1CSSCompiler/src/com/codename1/ui/css/ResourcesMutator.java b/CN1CSSCompiler/src/com/codename1/ui/css/ResourcesMutator.java
@@ -41,6 +41,7 @@
  * @author shannah
  */
 public class ResourcesMutator {
+    private boolean multiImage = true;
     private final EditableResources res;
     private Set<Integer> includedDensities = new HashSet<Integer>();
     public static final int DEFAULT_TARGET_DENSITY = com.codename1.ui.Display.DENSITY_VERY_HIGH;
@@ -94,6 +95,9 @@ public com.codename1.ui.EncodedImage storeImage(com.codename1.ui.EncodedImage im
 
         float ratioWidth = 0;
         int multiVal = targetDensity;
+        if (!multiImage) {
+            multiVal = 0;
+        }
         switch(multiVal) {
             // Generate RGB Image
             case 0:
@@ -618,4 +622,12 @@ public void log(String msg) {
         System.out.println(msg);
     }
 
+    public void setMultiImage(boolean mi) {
+        this.multiImage = mi;
+    }
+
+    public boolean getMultiImage() {
+        return multiImage;
+    }
+
 }
diff --git a/NowUIKit/css/desktop.png b/NowUIKit/css/desktop.png
diff --git a/NowUIKit/src/nowui.css.res b/NowUIKit/src/nowui.css.res
diff --git a/bin/cn1css-ant-task.jar b/bin/cn1css-ant-task.jar