[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing.Xsharp DrawingTopLevel
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing.Xsharp DrawingTopLevelWindow.cs, 1.9, 1.10 DrawingWindow.cs, 1.9, 1.10 |
Date: |
Fri, 25 Jul 2003 19:32:37 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp
In directory subversions:/tmp/cvs-serv5262/System.Drawing.Xsharp
Modified Files:
DrawingTopLevelWindow.cs DrawingWindow.cs
Log Message:
Copy the OnPaint clip logic to "DrawingTopLevelWindow"; make the coding
styles consistent.
Index: DrawingTopLevelWindow.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingTopLevelWindow.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** DrawingTopLevelWindow.cs 24 Jul 2003 17:46:40 -0000 1.9
--- DrawingTopLevelWindow.cs 25 Jul 2003 23:32:35 -0000 1.10
***************
*** 442,449 ****
{
DrawingGraphics g = new
DrawingGraphics(toolkit, graphics);
! System.Drawing.Graphics gr =
!
ToolkitManager.CreateGraphics(g);
! sink.ToolkitExpose(gr);
! gr.Dispose();
}
}
--- 442,453 ----
{
DrawingGraphics g = new
DrawingGraphics(toolkit, graphics);
! using(System.Drawing.Graphics gr =
!
ToolkitManager.CreateGraphics(g))
! {
!
gr.SetClip(DrawingWindow.RegionToDrawingRegion
!
(graphics.ExposeRegion),
!
CombineMode.Replace);
! sink.ToolkitExpose(gr);
! }
}
}
Index: DrawingWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingWindow.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** DrawingWindow.cs 25 Jul 2003 21:51:51 -0000 1.9
--- DrawingWindow.cs 25 Jul 2003 23:32:35 -0000 1.10
***************
*** 500,530 ****
{
DrawingGraphics g = new
DrawingGraphics(toolkit, graphics);
! using ( System.Drawing.Graphics gr =
ToolkitManager.CreateGraphics(g))
{
! using (Xsharp.Region region =
graphics.ExposeRegion)
! {
! gr.SetClip(
RegionToDrawingRegion(region), CombineMode.Replace);
! }
sink.ToolkitExpose(gr);
}
}
}
-
// Convert an Xsharp.Region to System.Drawig.Region
! private System.Drawing.Region RegionToDrawingRegion( Xsharp.Region
region)
! {
! Xsharp.Rectangle[] rectangles = region.GetRectangles();
! System.Drawing.Region newRegion = new System.Drawing.Region();
! newRegion.MakeEmpty();
! for (int i = 0; i < rectangles.Length; i++)
! {
! Xsharp.Rectangle rect = rectangles[i];
! newRegion.Union( new System.Drawing.Rectangle(rect.x,
! rect.y, rect.width, rect.height));
! }
! return newRegion;
! }
!
}; // class DrawingWindow
--- 500,528 ----
{
DrawingGraphics g = new
DrawingGraphics(toolkit, graphics);
! using(System.Drawing.Graphics gr =
!
ToolkitManager.CreateGraphics(g))
{
!
gr.SetClip(RegionToDrawingRegion(graphics.ExposeRegion),
!
CombineMode.Replace);
sink.ToolkitExpose(gr);
}
}
}
// Convert an Xsharp.Region to System.Drawig.Region
! internal static System.Drawing.Region RegionToDrawingRegion
! (Xsharp.Region region)
! {
! Xsharp.Rectangle[] rectangles =
region.GetRectangles();
! System.Drawing.Region newRegion = new
System.Drawing.Region();
! newRegion.MakeEmpty();
! for(int i = 0; i < rectangles.Length; i++)
! {
! Xsharp.Rectangle rect = rectangles[i];
! newRegion.Union(new
System.Drawing.Rectangle
! (rect.x, rect.y,
rect.width, rect.height));
! }
! return newRegion;
! }
}; // class DrawingWindow
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing.Xsharp DrawingTopLevelWindow.cs, 1.9, 1.10 DrawingWindow.cs, 1.9, 1.10,
Rhys Weatherley <address@hidden> <=