[Plib-cvs] CVS: plib/src/pui pu.h,1.95,1.96 puObject.cxx,1.39,1.40 puSlider.cxx,1.21,1.22

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv26624/pui

Modified Files:
	pu.h puObject.cxx puSlider.cxx 
Log Message:
Some more multi-line label / legend fixes

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- pu.h	28 Feb 2002 20:54:10 -0000	1.95
+++ pu.h	1 Mar 2002 14:54:44 -0000	1.96
@@ -969,7 +969,7 @@
   puButton   ( int minx, int miny, const char *l ) :
                  puObject ( minx, miny,
                             minx + puGetDefaultLegendFont().getStringWidth ( l ) + PUSTR_LGAP + PUSTR_RGAP,
-                            miny + puGetDefaultLegendFont().getStringHeight () + puGetDefaultLegendFont().getStringDescender () + PUSTR_TGAP + PUSTR_BGAP )
+                            miny + puGetDefaultLegendFont().getStringHeight ( l ) + puGetDefaultLegendFont().getStringDescender () + PUSTR_TGAP + PUSTR_BGAP )
   {
     type |= PUCLASS_BUTTON ;
     button_type = PUBUTTON_NORMAL ;

Index: puObject.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puObject.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- puObject.cxx	28 Feb 2002 21:22:27 -0000	1.39
+++ puObject.cxx	1 Mar 2002 14:54:44 -0000	1.40
@@ -239,7 +239,7 @@
     case PUPLACE_BOTTOM_CENTERED :
     case PUPLACE_BOTTOM_RIGHT    :
     case PUPLACE_BELOW_RIGHT     :
-      bbox.min[1] -= labelFont.getStringHeight () + labelFont.getStringDescender () +
+      bbox.min[1] -= labelFont.getStringHeight ( label ) + labelFont.getStringDescender () +
                      PUSTR_BGAP ;
       break ;
     }

Index: puSlider.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puSlider.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- puSlider.cxx	16 Dec 2001 16:30:50 -0000	1.21
+++ puSlider.cxx	1 Mar 2002 14:54:44 -0000	1.22
@@ -52,7 +52,7 @@
     if ( isVertical () )  // Vertical slider, text goes to the right of it
     {
       xx = bx.max[0] + PUSTR_LGAP ;
-      yy = ( bx.max[1] + bx.min[1] - legendFont.getStringHeight () ) / 2 ;
+      yy = ( bx.max[1] + bx.min[1] - legendFont.getStringHeight ( box_label ) ) / 2 ;
     }
     else  // Horizontal slider, text goes above it
     {