Changeset 1022

Timestamp:

05/10/10 14:54:06 (3 years ago)

Author:

pablo

Message:

• Playlist over state / transparency bug (915)
• Only colorize playlist using v4 colors (frontcolor, activecolor, etc)
• 'display.backgroundcolor' setting was not being respected.

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as (modified) (7 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/player/PlayerVersion.as

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = "5.2.1014";
+                protected static var _version:String = "5.2.1022";
                 
                 public static function get version():String {

trunk/fl5/src/com/longtailvideo/jwplayer/view/View.as

@@ -7 +7 @@
         import com.longtailvideo.jwplayer.events.PlaylistEvent;
         import com.longtailvideo.jwplayer.events.ViewEvent;
+        import com.longtailvideo.jwplayer.model.Color;
         import com.longtailvideo.jwplayer.model.Model;
         import com.longtailvideo.jwplayer.player.IPlayer;
@@ -207 +208 @@
                         background.name = "background";
                         _backgroundLayer.addChild(background);
-                        background.graphics.beginFill(_player.config.screencolor ? _player.config.screencolor.color : 0x000000, 1);
+                        
+                        var screenColor:Color;
+                        if (_model.config.pluginConfig('display').hasOwnProperty('backgroundcolor')) {
+                                screenColor = new Color(String(_model.config.pluginConfig('display')['backgroundcolor']));
+                        } else if (_model.config.screencolor) {
+                                screenColor = _model.config.screencolor;
+                        }
+                        
+                        background.graphics.beginFill(screenColor ? screenColor.color : 0x000000, 1);
                         background.graphics.drawRect(0, 0, 1, 1);
                         background.graphics.endFill();

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as

@@ -75 +75 @@
                         background.graphics.drawRect(0, 0, 1, 1);
                         background.graphics.endFill();
-                        if (player.config.screencolor) {
-                                var colorTransform:ColorTransform = new ColorTransform();
-                                colorTransform.color = player.config.screencolor.color;
-                                background.transform.colorTransform = colorTransform;
-                        }
+                        
                         _icon = new MovieClip();
                         addChildAt(icon, 1);

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as

@@ -213 +213 @@
                         var backActive:Sprite = getSkinElement("itemActive") as Sprite;
                         if (!backActive) {
-                                backActive = new Sprite();
+                                backActive = getSkinElement("item") as Sprite;
+                                if (!backActive) {
+                                        backActive = new Sprite();
+                                        backActive.graphics.beginFill(0, 1);
+                                        backActive.graphics.drawRect(0, 0, 100, 100);
+                                        backActive.graphics.endFill();
+                                }
                         }
                         backActive.name = "backActive";
+                        backActive.visible = false;
                         addElement(backActive, btn, 0, 0);
 
@@ -226 +233 @@
                         }
                         backOver.name = "backOver";
+                        backOver.visible = false;
                         addElement(backOver, btn, 0, 0);
                         
@@ -338 +346 @@
                                 }
                         } else {
-                                getButton(idx).setChildIndex(getButton(idx).getChildByName("backActive"), 0);
-                                getButton(idx).setChildIndex(getButton(idx).getChildByName("back"), 1);
-                                getButton(idx).setChildIndex(getButton(idx).getChildByName("backOver"), 2);
+                                getButton(idx).getChildByName("backActive").visible = false;
+                                getButton(idx).getChildByName("back").visible = false;
+                                getButton(idx).getChildByName("backOver").visible = true;
                         }
                 }
@@ -353 +361 @@
                                         var field:TextField = (getButton(idx).getChildByName(itm) as TextField)
                                         if (field) {
-                                                if (idx == active && ((activeColor && fontColor) || light)) {
+                                                if (idx == active && (activeColor || (light && swfSkinned))) {
                                                         field.textColor = activeColor ? activeColor.color : (fontColor ? fontColor.color : light.color);
                                                 } else {
@@ -364 +372 @@
                                         }
                                         
-                                        if (front && back) {
-                                                if (swfSkinned) {
+                                        if (swfSkinned) {
+                                                if (front && back) {
                                                         button.getChildByName("back").transform.colorTransform = back;
-                                                } else {
-                                                        button.setChildIndex(getButton(idx).getChildByName("backActive"), (idx == active ? 2 : 0));
-                                                        button.setChildIndex(getButton(idx).getChildByName("back"), 1);
-                                                        button.setChildIndex(getButton(idx).getChildByName("backOver"), 0);
-                                                }
+                                                } 
+                                        } else {
+                                                getButton(idx).getChildByName("backActive").visible = (idx == active);
+                                                getButton(idx).getChildByName("back").visible = (idx != active);
+                                                getButton(idx).getChildByName("backOver").visible = false;
                                         }
                                 }
@@ -718 +726 @@
                                 scrollInterval = setInterval(scrollEase, 50, idx * buttonheight / proportion, -idx * buttonheight + listmask.y);
                         }
-                        if (light || activeColor) {
+                        if ((light && swfSkinned) || activeColor) {
                                 for each (var itm:String in colorizableFields) {
                                         if (getButton(idx).getChildByName(itm)) {
                                                 try {
-                                                        (getButton(idx).getChildByName(itm) as TextField).textColor = activeColor ? activeColor.color : light.color;
+                                                        (getButton(idx).getChildByName(itm) as TextField).textColor = swfSkinned ? light.color : activeColor.color;
                                                 } catch (err:Error) {
                                                 }
@@ -745 +753 @@
                                         }
                                 } else {
-                                        getButton(active).setChildIndex(getButton(active).getChildByName("back"), 2);
-                                        getButton(active).setChildIndex(getButton(active).getChildByName("backOver"), 1);
-                                        getButton(active).setChildIndex(getButton(active).getChildByName("backActive"), 0);
+                                        getButton(active).getChildByName("back").visible = true;
+                                        getButton(active).getChildByName("backOver").visible = false;
+                                        getButton(active).getChildByName("backActive").visible = false;
                                 }
                         }
                         active = idx;
 
-                        if (swfSkinned) {
-                                
-                        } else {
-                                getButton(active).setChildIndex(getButton(active).getChildByName("backActive"), 2);
-                                getButton(active).setChildIndex(getButton(active).getChildByName("back"), 1);
-                                getButton(active).setChildIndex(getButton(active).getChildByName("backOver"), 0);
+                        if (!swfSkinned) {
+                                getButton(active).getChildByName("backActive").visible = true;
+                                getButton(active).getChildByName("back").visible = false;
+                                getButton(active).getChildByName("backOver").visible = false;
                         }