resources/RooUsage.txt

[app.Builder.js] / src / Builder4 / ClutterFiles.vala

diff --git a/src/Builder4/ClutterFiles.vala b/src/Builder4/ClutterFiles.vala
index 7f91be8..f10613d 100644 (file)
--- a/src/Builder4/ClutterFiles.vala
+++ b/src/Builder4/ClutterFiles.vala
@@ -150,7 +150,7 @@ public class Xcls_ClutterFiles : Object
         
         
        //_this.filelayout_manager.el.max_column_width = w - 200;
-       _this.filelayout.el.width = w - 200;
+       _this.filelayout.el.width = w ;
        
         this.el.set_size(
                // this.el.get_stage().width-150,
@@ -159,17 +159,17 @@ public class Xcls_ClutterFiles : Object
         );
         
         // 100 right for buttons ..
-        this.el.set_position(0,0);
+        this.el.set_position(75,0);
        
        
        this.scroller.el.set_size(
                // this.el.get_stage().width-150,
-               w-50,
+               w,
                h  // this.el.get_stage().height
         );
         
         // 100 right for buttons ..
-        this.scroller.el.set_position(75,50);
+        this.scroller.el.set_position(0,50);
         // scroll...
         _this.filelayout.el.y = 0.0f;
         
@@ -211,7 +211,7 @@ public class Xcls_ClutterFiles : Object
             this.el.add_constraint(
                 new Clutter.BindConstraint(_this.el,Clutter.BindCoordinate.SIZE, 0.0f)
             );
-            this.el.set_position(75,0);
+            this.el.set_position(0,0);
         }
 
         // user defined functions
@@ -346,7 +346,7 @@ public class Xcls_ClutterFiles : Object
 
             //listeners
             this.el.scroll_event.connect( ( event) => {
-               //Sprint("scroll event");
+                print("scroll event\n");
                 var y = _this.filelayout.el.y;
                 var dir = event.direction;
                 
@@ -366,38 +366,24 @@ public class Xcls_ClutterFiles : Object
                         y = float.max(bottompos, y);
                         
                         
+                        break;
+                         case Clutter.ScrollDirection.SMOOTH:
+                           double delta_x, delta_y;
+                           event.get_scroll_delta(out delta_x, out delta_y);
+                        //print("Scroll SMOOTH? by %f\n",  delta_y * event.y);
+                        y += ((float)delta_y * event.y * -1.0f) /2 ;
+                        y = float.max(bottompos, y);
+                        y = float.min(0, y); // 
+                                   
                         break;
                     default:
+                       print("scroll event = bad direction %s\n", dir.to_string());
                         return false;
                 }
                 // range of scroll -- can go up -- eg.. -ve value.
                 
             
                 
-                // to work out the max -ve number
-                // height of filelayout
-                // height of scrollactor..
-                
-            /*
-                if ( (-1 * (y+200)) > (  last_child_bottom - this.el.height)) {
-                    var nv =         _this.filelayout.el.y ;
-                    if (nv != -1 * (  last_child_bottom - this.el.height)) {
-                
-                        _this.filelayout.el.y = -1 * (  last_child_bottom - this.el.height);
-                        return true;
-                    }
-                
-                    return  false;
-                }
-            
-            */
-                
-                
-            //    print("\nlast child - this height = %f  ==== new y %f\n ".printf( 
-              //          last_child_bottom - this.el.height,
-               //         y));    
-               // y = float.min(0, y);    //??
-               // print("scroll event of %f  - new y = %f ".printf(event.y, y));
                print("Set scroll to %f (lcb=%f / height = %f)\n", y, last_child_bottom, this.el.height);
                
                 _this.filelayout.el.y = y;
@@ -799,18 +785,18 @@ public class Xcls_ClutterFiles : Object
             this.el.x_expand = true;
             this.el.y_align = Clutter.ActorAlign.START;
             this.el.reactive = true;
-            this.el.y_expand = false;
+            this.el.y_expand = true;
 
             // init method
 
             {
-                this.filepath = filepath;
+               this.filepath = filepath;
             }
 
             //listeners
             this.el.button_press_event.connect( (  event) => {
                 
-               var f = JsRender.JsRender.factory(_this.project, this.filepath);
+               var f = JsRender.JsRender.factory("PlainFile", _this.project, this.filepath);
                 _this.open(f);
                 return false;
             });