[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Graphics.cs,1.3,1.4 StringFormat.cs,1.3,1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing
In directory subversions:/tmp/cvs-serv19710/System.Drawing

Modified Files:
        Graphics.cs StringFormat.cs 
Log Message:


Implement the "ButtonBase" and "Button" classes, to provide simple
control functionality.


Index: Graphics.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Graphics.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Graphics.cs 9 Jun 2003 22:15:09 -0000       1.3
--- Graphics.cs 12 Jun 2003 02:55:48 -0000      1.4
***************
*** 1174,1178 ****
                                        SelectFont(font);
                                        SelectBrush(brush);
!                                       ToolkitGraphics.DrawString(s, rect, 
format);
                                }
                        }
--- 1174,1207 ----
                                        SelectFont(font);
                                        SelectBrush(brush);
!                                       if(format != null &&
!                                          (format.Alignment != 
StringAlignment.Near ||
!                                           format.LineAlignment != 
StringAlignment.Near))
!                                       {
!                                               // Adjust the rectangle for the 
alignment values.
!                                               int charactersFitted, 
linesFilled;
!                                               Size size = 
ToolkitGraphics.MeasureString
!                                                       (s, rect, null,
!                                                        out charactersFitted, 
out linesFilled, true);
!                                               if(format.Alignment == 
StringAlignment.Center)
!                                               {
!                                                       rect[0].X +=
!                                                               (rect[1].X - 
rect[0].X - size.Width) / 2;
!                                               }
!                                               else if(format.Alignment == 
StringAlignment.Far)
!                                               {
!                                                       rect[0].X = rect[1].X - 
size.Width;
!                                               }
!                                               if(format.LineAlignment == 
StringAlignment.Center)
!                                               {
!                                                       rect[0].Y +=
!                                                               (rect[2].Y - 
rect[0].Y - size.Height) / 2;
!                                               }
!                                               else if(format.Alignment == 
StringAlignment.Far)
!                                               {
!                                                       rect[0].Y = rect[2].Y - 
size.Height;
!                                               }
!                                       }
!                                       ToolkitGraphics.DrawString
!                                               (s, rect[0].X, rect[0].Y, 
format);
                                }
                        }
***************
*** 1900,1904 ****
                                        Size size = 
ToolkitGraphics.MeasureString
                                                (text, rect, format,
!                                                out charactersFitted, out 
linesFilled);
                                        return new 
SizeF(ConvertSizeBack(size.Width, size.Height));
                                }
--- 1929,1933 ----
                                        Size size = 
ToolkitGraphics.MeasureString
                                                (text, rect, format,
!                                                out charactersFitted, out 
linesFilled, false);
                                        return new 
SizeF(ConvertSizeBack(size.Width, size.Height));
                                }

Index: StringFormat.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/StringFormat.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** StringFormat.cs     9 Jun 2003 22:15:09 -0000       1.3
--- StringFormat.cs     12 Jun 2003 02:55:48 -0000      1.4
***************
*** 183,187 ****
  
        // Get tab stop information for this format.
!       public float[] GetTopStops(out float firstTabOffset)
                        {
                        #if CONFIG_EXTENDED_NUMERICS
--- 183,187 ----
  
        // Get tab stop information for this format.
!       public float[] GetTabStops(out float firstTabOffset)
                        {
                        #if CONFIG_EXTENDED_NUMERICS