fix: Bitmap.setImage need set width&height

hiloteam · May 18, 2016 · 7806046 · 7806046
1 parent e192627
commit 7806046
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/view/Bitmap.js b/src/view/Bitmap.js
@@ -87,6 +87,13 @@
             this.width = rect[2];
             this.height = rect[3];
         }
+        else if(!this.width && !this.height){
+            var rect = this.drawable.rect;
+            if(rect){
+                this.width = rect[2];
+                this.height = rect[3];
+            }
+        }
         return this;
     }
  });
diff --git a/test/html/index.html b/test/html/index.html
@@ -28,8 +28,8 @@
     <script src="mocha.js"></script>
     <script src='utils.js'></script>
     <script src="../../node_modules/should/should.js"></script>
-    <script src="../../build/standalone/hilo-standalone.js"></script>
-    <script src="../../build/flash/hilo-flash.js" data-auto="true"></script>
+    <script src="../../build/standalone/hilo-standalone.min.js"></script>
+    <script src="../../build/flash/hilo-flash.min.js" data-auto="true"></script>
     <script>
     mocha.setup({
         ui:'bdd',

diff --git a/test/view.js b/test/view.js
@@ -26,9 +26,10 @@ describe('view', function() {
     });
 
     describe('Bitmap', function() {
-        var bmp;
+        var bmp, btnImage;
         beforeEach('init bitmap', function(done){
             utils.loadImage('images/btn.png', function(img){
+                btnImage = img;
                 bmp = new Hilo.Bitmap({
                     image: img,
                     rect:[0, 64, 64, 64]
@@ -59,6 +60,13 @@ describe('view', function() {
                 utils.diffWithScreenshot('Bitmap-setImage', done);
             });
         });
+
+        it('new Bitmap and setImage', function(){
+            var bmp = new Hilo.Bitmap();
+            bmp.setImage(btnImage);
+            bmp.width.should.equal(256);
+            bmp.height.should.equal(128);
+        });
     });
 
     describe('BitmapText', function() {