[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/Xsharp FontExtents.cs,1.1,1.2 Graphi
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/Xsharp FontExtents.cs,1.1,1.2 Graphics.cs,1.4,1.5 XsharpSupport.c,1.2,1.3 |
Date: |
Sat, 07 Jun 2003 05:59:20 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv31001/Xsharp
Modified Files:
FontExtents.cs Graphics.cs XsharpSupport.c
Log Message:
Use the logical extents for text drawing/measuring, not the ink extents.
Index: FontExtents.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/FontExtents.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FontExtents.cs 7 Jun 2003 07:40:16 -0000 1.1
--- FontExtents.cs 7 Jun 2003 09:59:18 -0000 1.2
***************
*** 49,53 ****
ascent = -(max_logical.y);
descent = max_logical.height + max_logical.y;
! maxWidth = max_ink.width;
// Increase the descent to account for
underlining.
--- 49,53 ----
ascent = -(max_logical.y);
descent = max_logical.height + max_logical.y;
! maxWidth = max_logical.width;
// Increase the descent to account for
underlining.
Index: Graphics.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Graphics.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Graphics.cs 7 Jun 2003 07:40:16 -0000 1.4
--- Graphics.cs 7 Jun 2003 09:59:18 -0000 1.5
***************
*** 2269,2275 ****
Xlib.XSharpTextExtents
(fontSet, str, out overall_ink, out
overall_logical);
! width = overall_ink.width;
! ascent = -(overall_ink.y);
! descent = overall_ink.height + overall_ink.y;
// Increase the descent to account for
underlining.
--- 2269,2275 ----
Xlib.XSharpTextExtents
(fontSet, str, out overall_ink, out
overall_logical);
! width = overall_logical.width;
! ascent = -(overall_logical.y);
! descent = overall_logical.height +
overall_logical.y;
// Increase the descent to account for
underlining.
Index: XsharpSupport.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/XsharpSupport.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** XsharpSupport.c 7 Jun 2003 07:40:16 -0000 1.2
--- XsharpSupport.c 7 Jun 2003 09:59:18 -0000 1.3
***************
*** 215,219 ****
XSetLineAttributes(dpy, gc, 1, LineSolid, CapNotLast,
JoinMiter);
XDrawLine(dpy, drawable, gc, x, y + 2,
! x + overall_ink_return.width, y + 2);
}
}
--- 215,219 ----
XSetLineAttributes(dpy, gc, 1, LineSolid, CapNotLast,
JoinMiter);
XDrawLine(dpy, drawable, gc, x, y + 2,
! x + overall_logical_return.width, y + 2);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/Xsharp FontExtents.cs,1.1,1.2 Graphics.cs,1.4,1.5 XsharpSupport.c,1.2,1.3,
Rhys Weatherley <address@hidden> <=