Changeset 76

Timestamp:

07/24/08 17:07:56 (4 weeks ago)

Author:

bi..@lilyapp.org

Message:

fix bug #73

Files:

• trunk/lily/lily/chrome/content/externals/patcher.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/inspector.js (modified) (1 diff)
• trunk/lily/lily/chrome/content/lily.js (modified) (3 diffs)
• trunk/lily/lily/chrome/content/patch.js (modified) (2 diffs)
• trunk/lily/lily/chrome/content/utils.js (modified) (1 diff)

trunk/lily/lily/chrome/content/externals/patcher.js

@@ -307 +307 @@
-                setTimeout(function(){
-                        openPatchWin.obj.patchView.setPatchTitle("[subpatch]"); //mark it as a subpatch
-
+//
-                },500);
-                

trunk/lily/lily/chrome/content/inspector.js

@@ -72 +72 @@
-//              LilyDebugWindow.print("open the window...")                             
-                if(!this.iWin) {
-
+
+
-                } else {
-                        LilyInspectorWindow.init(id);

trunk/lily/lily/chrome/content/lily.js

@@ -1198 +1198 @@
-                };
-                
-
+
+
+
-                        for(var x in val) {
-                                switch(x) {
@@ -1239 +1241 @@
-                }
-                
+                var tmp = LilyUtils.getOpenDialogCoords(250,height);
+                
-                var initVals = { color: color, type: type };
-                
-50,top=550
+"+tmp[0]+",top="+tmp[1]+"
-                        if(type=="patch")
-                                Lily.setPatchColor(val);
@@ -1458 +1462 @@
-                        opens the preferences dialog.                                                                                                                                   
-        */
-       
+
-        Lily.getCurrentPatch().patchView.xulWin.openDialog("chrome://lily/content/prefs.xul", "lilyPrefsDialog", "chrome,titlebar,toolbar,centerscreen,modal",LilyAPIKeyManager,LilyDebugWindow);
-        },

trunk/lily/lily/chrome/content/patch.js

@@ -2302 +2302 @@
-        //standard patch        
-        if(!this.patch.hidden && !this.patch.readonly && !extWin)       {
-
+
+
-        //hidden patch
-        } else if(this.patch.hidden && !extWin) {
@@ -2311 +2312 @@
-                //this.xulWin=window.openDialog("chrome://lily/content/hiddenpatch.xul", pID,"",initReadOnlyWindow,pID);        //hidden patch  
-        } else if(this.patch.readonly && !extWin) {
-
+
+
-        //patch in iframe
-        } else if(extWin && extWin.type=="iframe") {

trunk/lily/lily/chrome/content/utils.js

@@ -1338 +1338 @@
-        
-        /*
+                Method: getOpenDialogCoords
+                        get the coordiates for opening a dialog.
+                
+                Returns: 
+                        an array of x,y coords
+        */
+        getOpenDialogCoords: function(w,h) {
+                var sH = parseInt(window.screen.availHeight)/2;
+                var sW = parseInt(window.screen.availWidth)/2;
+                
+                var x = (sW-parseInt(w/2));
+                var y = (sH-parseInt(h/2));
+                
+                return [x,y];
+        },
+        
+        /*
+                Method: getOpenDialogOffset
+                        get the coordiates of all open windows and calculate an offset for a new window if any.
+                
+                Returns: 
+                        an array of x,y coords
+        */
+        getOpenDialogOffset: function(w,h) {
+                var tmp = Lily.getCurrentPatch();
+                        
+                if(     tmp &&
+                        parseInt(tmp.patchView.xulWin.screenX) && 
+                        parseInt(tmp.patchView.xulWin.screenY)
+                ) {
+                        return [
+                                parseInt(tmp.patchView.xulWin.screenX)+15,
+                                parseInt(tmp.patchView.xulWin.screenY)+15
+                        ]
+                } else {
+                        var tmp_coords = this.getOpenDialogCoords(w,h);
+                        return [tmp_coords[0],tmp_coords[1]];
+                }
+        },      
+        
+        /*
-                Method: getObjectPos
-                        get the position of an object.