[Gzz-commits] gzz/gzz view/MarkDecorator.java vob/TextVob.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/28 15:52:02

Modified files:
        gzz/view       : MarkDecorator.java 
        gzz/vob        : TextVob.java 

Log message:
        a) don't scale in MarkDecorator; b) pass second coordsys in TextVob

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gzz/gzz/view/MarkDecorator.java
diff -c gzz/gzz/view/MarkDecorator.java:1.1 gzz/gzz/view/MarkDecorator.java:1.2
*** gzz/gzz/view/MarkDecorator.java:1.1 Sat Sep 28 13:50:35 2002
--- gzz/gzz/view/MarkDecorator.java     Sat Sep 28 15:52:02 2002
***************
*** 31,37 ****
        float x = outer.width - w - PAD,
              y = outer.height - h - PAD;
  
!       int cs_list = sc.coordsys(into, KEY, 0, x, y, w, h);
  
          for(int i=0; i<n; i++) {
            Mark m = (Mark)fallback.binder.marks.get(i);
--- 31,37 ----
        float x = outer.width - w - PAD,
              y = outer.height - h - PAD;
  
!       int cs_list = sc.coordsys(into, KEY, 0, x, y, 2, 2);
  
          for(int i=0; i<n; i++) {
            Mark m = (Mark)fallback.binder.marks.get(i);
***************
*** 54,57 ****
        int cs = sc.coordsys(into, TEXT_KEY, 0, x, y, w, h);
        sc.map.put(new TextVob(style, 1, str), cs);
      }
! }
\ No newline at end of file
--- 54,57 ----
        int cs = sc.coordsys(into, TEXT_KEY, 0, x, y, w, h);
        sc.map.put(new TextVob(style, 1, str), cs);
      }
! }
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.30 gzz/gzz/vob/TextVob.java:1.31
*** gzz/gzz/vob/TextVob.java:1.30       Sat Sep 28 05:59:03 2002
--- gzz/gzz/vob/TextVob.java    Sat Sep 28 15:52:02 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.30 2002/09/28 09:59:03 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 31,37 ----
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.31 2002/09/28 19:52:02 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 126,132 ****
            cl = GLRen.createCallList("Color 0 0 0 1");
        }
        curs = cl.addToListGL(win, list, curs, coordsys1, 0);
!       curs = ht.addToListGL(win, list, curs, coordsys1, 0);
        return curs;
      }
  
--- 126,132 ----
            cl = GLRen.createCallList("Color 0 0 0 1");
        }
        curs = cl.addToListGL(win, list, curs, coordsys1, 0);
!       curs = ht.addToListGL(win, list, curs, coordsys1, coordsys2);
        return curs;
      }