Attachment 67435 Details for Bug 131645 – Patch

[patch] Patch

tree.diff (text/plain), 5.51 KB, created by Rutger Ovidius

on 2007-05-16 12:12:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rutger Ovidius

Created: 2007-05-16 12:12:25 EDT

Size: 5.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java,v
>retrieving revision 1.425
>diff -u -r1.425 Tree.java
>--- Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java	15 May 2007 16:15:26 -0000	1.425
>+++ Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java	16 May 2007 01:23:31 -0000
>@@ -869,15 +869,27 @@
> 					HDITEM hdItem = new HDITEM ();
> 					hdItem.mask = OS.HDI_WIDTH;
> 					OS.SendMessage (hwndHeader, OS.HDM_GETITEM, 0, hdItem);
>-					RECT rect = new RECT ();
>-					OS.SetRect (rect, nmcd.left + hdItem.cxy, nmcd.top, nmcd.right, nmcd.bottom);
>-					OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+					//RECT rect = new RECT ();
>+					//OS.SetRect (rect, nmcd.left + hdItem.cxy, nmcd.top, nmcd.right, nmcd.bottom);
>+					//OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+					int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+					int oldPen = OS.SelectObject (hDC, newPen);
>+					int [] points = {nmcd.left+hdItem.cxy, nmcd.bottom-1, nmcd.right, nmcd.bottom-1};
>+					OS.Polyline (hDC, points, points.length / 2);
>+					OS.SelectObject (hDC, oldPen);
>+					OS.DeleteObject (newPen);
> 				}
> 			}
> 		}
>-		RECT rect = new RECT ();
>-		OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
>-		OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+		//RECT rect = new RECT ();
>+		//OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
>+		//OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+		int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+		int oldPen = OS.SelectObject (hDC, newPen);
>+		int [] points = {nmcd.left, nmcd.bottom-1, nmcd.right, nmcd.bottom-1};
>+		OS.Polyline (hDC, points, points.length / 2);
>+		OS.SelectObject (hDC, oldPen);
>+		OS.DeleteObject (newPen);
> 	}
> 	if (!explorerTheme) {
> 		if (handle == OS.GetFocus ()) {
>@@ -988,9 +1000,15 @@
> 	if (OS.IsWindowVisible (handle) && nmcd.left < nmcd.right && nmcd.top < nmcd.bottom) {
> 		if (hFont != -1) OS.SelectObject (hDC, hFont);
> 		if (linesVisible) {
>-			RECT rect = new RECT ();
>-			OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
>-			OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+			//RECT rect = new RECT ();
>+			//OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
>+		    //OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+		    int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+		    int oldPen = OS.SelectObject (hDC, newPen);
>+		    int [] points = {nmcd.left, nmcd.bottom-1, nmcd.right, nmcd.bottom-1};
>+		    OS.Polyline (hDC, points, points.length / 2);
>+		    OS.SelectObject (hDC, oldPen);
>+		    OS.DeleteObject (newPen); 
> 		}
> 		//TODO - BUG - measure and erase sent when first column is clipped
> 		if (hooks (SWT.MeasureItem)) {
>@@ -1356,17 +1374,23 @@
> 			int hDC = nmcd.hdc;
> 			if (hwndHeader != 0) {
> 				int x = 0;
>-				RECT rect = new RECT ();
>+				//RECT rect = new RECT ();
> 				HDITEM hdItem = new HDITEM ();
> 				hdItem.mask = OS.HDI_WIDTH;
> 				int count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0);
>+				int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+				int oldPen = OS.SelectObject (hDC, newPen);
> 				for (int i=0; i<count; i++) {
> 					int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, i, 0);
> 					OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem);
>-					OS.SetRect (rect, x, nmcd.top, x + hdItem.cxy, nmcd.bottom);
>-					OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_RIGHT);
>+					//OS.SetRect (rect, x, nmcd.top, x + hdItem.cxy, nmcd.bottom);
>+					//OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_RIGHT);
>+					int [] points = {x + hdItem.cxy - 1, nmcd.top, x + hdItem.cxy - 1, nmcd.bottom - 1};
>+					OS.Polyline (hDC, points, points.length / 2);
> 					x += hdItem.cxy;
> 				}
>+				OS.SelectObject (hDC, oldPen);
>+				OS.DeleteObject (newPen);
> 			}
> 			int height = 0;
> 			RECT rect = new RECT ();
>@@ -1381,13 +1405,25 @@
> 				height = OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0);
> 				OS.GetClientRect (handle, rect);
> 				OS.SetRect (rect, rect.left, rect.top, rect.right, rect.top + height);
>-				OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+				//OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+				int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+				int oldPen = OS.SelectObject (hDC, newPen);
>+				int [] points = {rect.left, rect.bottom-1, rect.right, rect.bottom-1};
>+				OS.Polyline (hDC, points, points.length / 2);
>+				OS.SelectObject (hDC, oldPen);
>+				OS.DeleteObject (newPen); 
> 			}
>+			int newPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DFACE));
>+			int oldPen = OS.SelectObject (hDC, newPen);
> 			while (rect.bottom < nmcd.bottom) {
> 				int top = rect.top + height;
> 				OS.SetRect (rect, rect.left, top, rect.right, top + height);
>-				OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+				//OS.DrawEdge (hDC, rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
>+				int [] points = {rect.left, top+height-1, rect.right, top+height-1};
>+				OS.Polyline (hDC, points, points.length / 2);
> 			}
>+			OS.SelectObject (hDC, oldPen);
>+			OS.DeleteObject (newPen);
> 		}
> 	}
> 	return new LRESULT (OS.CDRF_DODEFAULT);
>

Actions: View | Diff

Attachments on bug 131645: 67435