[subversion:15] Version 0.19

[sherod@kenai.com]

Repository: subversion
Revision:   15
Author:     sherod
Date:       2009-01-21 01:00:17 UTC

Log Message:
-----------
Version 0.19

Modified Paths:
--------------
    twitterfx/src/scrollpanel/Scroll.fx
    twitterfx/src/twitterfx/Main.fx
    twitterfx/src/twitterfx/components/FriendNode.fx
    twitterfx/src/twitterfx/panels/StatusPanel.fx

Removed Paths:
-------------
    twitterfx/*.cc.new

Diffs:
-----
Index: twitterfx/src/twitterfx/Main.fx
===================================================================
--- twitterfx/src/twitterfx/Main.fx     (revision 14)
+++ twitterfx/src/twitterfx/Main.fx     (revision 15)
@@ -499,7 +499,7 @@
         x: twitterConfig.startX;
         y: twitterConfig.startY;
         resizable: true
-        title: "TwitterFX (0.18)"
+        title: "TwitterFX (0.19)"
         scene: mainScene
         opacity: 0.3
         width: twitterConfig.startWidth;
Index: twitterfx/src/twitterfx/panels/StatusPanel.fx
===================================================================
--- twitterfx/src/twitterfx/panels/StatusPanel.fx       (revision 14)
+++ twitterfx/src/twitterfx/panels/StatusPanel.fx       (revision 15)
@@ -25,20 +25,27 @@
  * @author steven
  */
 
+import javafx.lang.FX;
 import javafx.scene.Group;
+import javafx.scene.layout.VBox;
 import javafx.scene.Node;
 import javax.swing.ImageIcon;
 import scrollpanel.ScrollPanel;
 import twitterfx.components.StatusNode;
 import twitterfx.Main;
 import twitterfx.twitter.Status;
-import javafx.scene.layout.VBox;
 
 
 
 
-public class StatusPanel extends ScrollPanel {
+public class StatusPanel extends ScrollPanel, Group {
 
+    init {
+        impl_layout = function(bob:Group) {
+            //do nothing
+        }
+    }
+
     var imgURL:java.net.URL =
getClass().getResource("notification.gif");
     var icon:ImageIcon = new ImageIcon(imgURL);
     var hasBeenSetup:Boolean = false;
@@ -47,24 +54,31 @@
     public var notificationText:String;
     public var filterBy:String on replace {
         if (filterBy != "")
-        {    unfilteredStatus = statuses;
-             statuses = for (x in statuses where x.user.screenName ==
filterBy) x;
+        {
+            unfilteredStatus = statuses;
+            statuses =
+            for (x in statuses where x.user.screenName == filterBy) x;
         } else {
             statuses = unfilteredStatus;
             delete unfilteredStatus;
         }
     }
+    public var currentIndex:Integer;
+    public var mostRecentId:Integer;
+    var scrollPosition:Number = bind scroll.finalPosition on replace {
 
-    public var mostRecentId:Integer;
-    var scrollPosition:Number = bind scroll.position;
-    public var currentIndex:Integer = bind ((
-    scrollPosition / (scroll.height / statuses.size())) as Integer);
/* on replace {
-        for (p in body.content ) {
-            var s:StatusNode = (p as StatusNode);
-            s.status = statuses[currentIndex + s.position];
-        }
-    } ;*/
-    
+        FX.deferAction(function() {
+            currentIndex = ((
+            scrollPosition / (scroll.height / statuses.size())) as
Integer);
+        return});
+        };
+    /* on replace {
+    for (p in body.content ) {
+     var s:StatusNode = (p as StatusNode);
+     s.status = statuses[currentIndex + s.position];
+     }
+     } ;*/
+
     public var newCount:Integer;
 
     public function refresh():Void {
@@ -113,9 +127,11 @@
         mostRecentId = status.id;
 
         if ((filterBy != "") and (status.user.screenName != filterBy))
-        {    insert status into unfilteredStatus;}
+        {    insert status into unfilteredStatus;
+        }
         else
-         {   insert status into statuses;}
+        {   insert status into statuses;
+        }
     }
 
 
@@ -128,14 +144,16 @@
             
        
         /* insert StatusNode {
-            status: status
-            position: 0;  //(body.content.size());
-            } into statusNodes;*/
+        status: status
+         position: 0;  //(body.content.size());
+         } into statusNodes;*/
 
         if ((filterBy != "") and (status.user.screenName != filterBy))
-        {    insert status before unfilteredStatus[0];}
+        {    insert status before unfilteredStatus[0];
+        }
         else
-         {   insert status before statuses[0];}
+        {   insert status before statuses[0];
+        }
     }
 
 
@@ -144,7 +162,8 @@
 
     override protected function create() : Node {
         var b = super.create();
-        body = VBox{ spacing: 0 }
+        body = VBox{
+            spacing: 0 }
         return b;
     }
 
Index: twitterfx/src/twitterfx/components/FriendNode.fx
===================================================================
--- twitterfx/src/twitterfx/components/FriendNode.fx    (revision 14)
+++ twitterfx/src/twitterfx/components/FriendNode.fx    (revision 15)
@@ -83,6 +83,7 @@
                 Main.mouseX = e.sceneX;
                 Main.mouseY = e.sceneY;
                 Main.toolTip.opacity = 1
+               
             }
             onMouseExited: function( e: MouseEvent ):Void {
                 Main.toolTip.opacity = 0
Index: twitterfx/src/scrollpanel/Scroll.fx
===================================================================
--- twitterfx/src/scrollpanel/Scroll.fx (revision 14)
+++ twitterfx/src/scrollpanel/Scroll.fx (revision 15)
@@ -24,7 +24,7 @@
     public var  bodyHeight: Number;
     public var maxPosition:Number;
     public var  position:Number;
-    public var oldPosition:Number;
+    public var finalPosition:Number;
     public var scrollMove:Integer;
     var  barSizeMin:Number=30;
     var  barSize:Number = 60;
@@ -40,11 +40,11 @@
             position = (e.y - (barSize / 2));
           
             if (position >= (height - barSize))
-            position = (height - barSize);
+                position = (height - barSize);
             if (position <= 0)
-            position = 0.0;
+                position = 0.0;
 
-            
+            finalPosition = position;
         };
 
         this.onMouseDragged = function(e:MouseEvent):Void {
@@ -63,7 +63,7 @@
         this.onMouseWheelMoved = function(e:MouseEvent):Void {
 
             var moveAmount:Number;
-/*
+
             if (e.wheelRotation < 10 and e.wheelRotation > 0)
             {moveAmount = 10;
              }
@@ -72,7 +72,7 @@
             {moveAmount = -10;
             }
              else
-            {moveAmount = e.wheelRotation;}*/
+            {moveAmount = e.wheelRotation;}
 
             position = position + e.wheelRotation; //moveAmount;
       
@@ -80,6 +80,8 @@
             position = (height - barSize);
             if (position <= 0)
             position = 0.0;
+
+            finalPosition = position;
          
         };
 }