[Gzz-commits] fenfire/org/fenfire/view/buoy TransclusionConne...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/07/28 03:34:49

Modified files:
        org/fenfire/view/buoy: TransclusionConnector.java 

Log message:
        Show more context for transclusions - makes no sense otherwise

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.14 
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.15
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.14       Thu Jul 
17 12:28:19 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java    Mon Jul 28 
03:34:49 2003
@@ -45,7 +45,11 @@
 /** Hang transclusion buoys.
  */
 public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.14 
2003/07/17 16:28:19 mudyc Exp $";
+<<<<<<< TransclusionConnector.java
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.15 
2003/07/28 07:34:49 tjl Exp $";
+=======
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.15 
2003/07/28 07:34:49 tjl Exp $";
+>>>>>>> 1.14
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("TransclusionConnector:: "+s); }
 
@@ -161,14 +165,18 @@
        }
     }
 
-    public int dx = 30, dy = 30;
+    public float mx = 1.1f, my = 1.1f;
     protected java.awt.Rectangle getRect(Object node) {
        if (node == null) throw new Error("Impossible!");
        float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
        float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
        Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
-       return new java.awt.Rectangle((int)(x-dx), (int)(y-dy), 
-                                     (int)p.getWidth()+dx+dx, 
-                                     (int)p.getHeight()+dy+dy);
+       float w = p.getWidth();
+       float h = p.getHeight();
+       int bw = (int)(mx * w);
+       int bh = (int)(my * h);
+       return new java.awt.Rectangle((int)(x-bw), (int)(y-bh), 
+                                     (int)w+2*bw, 
+                                     (int)h+2*bh);
     }
 }