Review points fix

Review points fixed

Author: lathapatil

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Group.java

@@ -43,13 +43,13 @@
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  * @noextend This class is not intended to be subclassed by clients.
  */
-public class Group extends Composite implements ICustomWidget {
+public class Group extends Composite {
 	private String text = "";
-	static final int CLIENT_INSET = 3;
+	private static final int CLIENT_INSET = 3;
 	private Listener listener;
-	private boolean enabled = true;
 	private int orientation = SWT.LEFT_TO_RIGHT;
-	private static int DRAW_FLAGS = SWT.DRAW_MNEMONIC | SWT.DRAW_TAB | SWT.DRAW_TRANSPARENT | SWT.DRAW_DELIMITER;
+	private static final int DRAW_FLAGS = SWT.DRAW_MNEMONIC | SWT.DRAW_TAB | SWT.DRAW_TRANSPARENT | SWT.DRAW_DELIMITER;
+	private Point textExtent = new Point(0, 0);
 
 /**
  * Constructs a new instance of this class given its parent
@@ -97,48 +97,51 @@ public Group (Composite parent, int style) {
 }
 
 private void onPaint(Event event) {
-	if (isVisible()) {
-		Drawing.drawWithGC(this, event.gc, this::doPaint);
-	}
+	Drawing.drawWithGC(this, event.gc, this::drawGroup);
 }
 
-private void doPaint(GC gc) {
-	Rectangle bounds = getBounds();
-	if (bounds.width > 0 && bounds.height > 0) {
-		drawGroup(gc, bounds.width, bounds.height);
-	}
-}
+private void drawGroup(GC gc) {
 
-private void drawGroup(GC gc, int width, int height) {
-	int titleWidth = gc.textExtent(text).x;
-	int titleHeight = gc.textExtent(text).y;
+	int width = getBounds().width;
+	int height = getBounds().height;
+	int titleWidth = textExtent.x;
+	int titleHeight = textExtent.y;
 
-	int inset = 2, groupInset = 8, borderRadius = 6;
-	int textX = inset + groupInset, textY = titleHeight;
-	int newWidth = width - (inset * 2), newHeight = height - (inset * 5);
+	int inset = 2;
+	int groupInset = 8;
+	int borderRadius = 6;
+	int textX = inset + groupInset;
+	int textY = titleHeight;
+	int newWidth = width - (inset * 2);
+	int newHeight = height - (inset * 5);
 
 	// Set shadow color
 	gc.setForeground(getShadowColor());
 
 	// Draw group border
 	gc.drawRoundRectangle(inset, textY / 2, newWidth, newHeight, borderRadius, borderRadius);
 
-	// Draw text background and text
+	// Draw text background (A fillRectangle to erase the part of the group border
+	// where text is drawn) and text
 	int textPosX = (orientation == SWT.RIGHT_TO_LEFT) ? newWidth - groupInset - titleWidth : textX;
 	gc.fillRectangle(textPosX, textY / 2, titleWidth, gc.getLineWidth() + 1);
 	gc.setForeground(getForeground());
-	gc.drawText(text, textPosX, 0);
+	gc.drawText(text, textPosX, 0, DRAW_FLAGS);
 }
 
 private Color getShadowColor() {
-	if ((style & SWT.SHADOW_ETCHED_IN) != 0)
+	if ((style & SWT.SHADOW_ETCHED_IN) != 0) {
 		return new Color(136, 136, 136);
-	if ((style & SWT.SHADOW_ETCHED_OUT) != 0)
+	}
+	if ((style & SWT.SHADOW_ETCHED_OUT) != 0) {
 		return new Color(68, 68, 68);
-	if ((style & SWT.SHADOW_IN) != 0)
+	}
+	if ((style & SWT.SHADOW_IN) != 0) {
 		return new Color(102, 102, 102);
-	if ((style & SWT.SHADOW_OUT) != 0)
+	}
+	if ((style & SWT.SHADOW_OUT) != 0) {
 		return new Color(187, 187, 187);
+	}
 	return getForeground();
 }
 
@@ -153,6 +156,9 @@ static int checkStyle (int style) {
 		style |= SWT.LEFT_TO_RIGHT;
 		style &= ~SWT.RIGHT_TO_LEFT;
 	}
+	if ((style & SWT.BORDER) != 0) {
+		style |= SWT.SHADOW_IN;
+	}
 	/*
 	* Even though it is legal to create this widget
 	* with scroll bars, they serve no useful purpose
@@ -169,32 +175,24 @@ protected void checkSubclass () {
 }
 
 @Override
-public Point computeSizeInPixels(int wHint, int hHint, boolean changed) {
+public Point computeSize(int wHint, int hHint, boolean changed) {
 	checkWidget();
-
-	Point size = DPIUtil.autoScaleUp(super.computeSizeInPixels(wHint, hHint, changed));
+	Point size = DPIUtil.autoScaleUp(super.computeSize(wHint, hHint, changed));
 
 	if (!changed && new Point(wHint, hHint).equals(size)) {
 		return size;
 	}
-
 	if (text == null || text.isEmpty()) {
 		return size;
 	}
-
-	Point textExtent = Drawing.executeOnGC(this, gc -> {
-		gc.setFont(getFont());
-		return gc.textExtent(text, DRAW_FLAGS);
-	});
-
-	Point layoutSize = (getLayout() != null) ? getLayout().computeSize(this, wHint, hHint, changed)
+	Layout layout = getLayout();
+	Point layoutSize = (layout != null) ? layout.computeSize(this, wHint, hHint, changed)
 			: computeChildrenSize(changed);
 
 	int width = Math.max(10, Math.max(layoutSize.x + CLIENT_INSET * 2, textExtent.x + CLIENT_INSET * 6));
 	int height = Math.max(10, Math.max(layoutSize.y + CLIENT_INSET * 4, textExtent.y + CLIENT_INSET * 4));
 
 	size = DPIUtil.autoScaleUp(new Point(wHint != SWT.DEFAULT ? wHint : width, hHint != SWT.DEFAULT ? hHint : height));
-
 	return size;
 }
 
@@ -208,21 +206,14 @@ private Point computeChildrenSize(boolean changed) {
 	return size;
 }
 
-
 @Override
-public Rectangle computeTrimInPixels(int x, int y, int width, int height) {
+public Rectangle computeTrim(int x, int y, int width, int height) {
 	checkWidget();
-	Rectangle trim = super.computeTrimInPixels(x, y, width, height);
+	Rectangle trim = super.computeTrim(x, y, width, height);
 	trim.width = width + CLIENT_INSET * 2;
 	trim.height = height + CLIENT_INSET * 2;
 
-	int textHeight = Drawing.executeOnGC(this, gc -> {
-		gc.setFont(getFont());
-		return gc.textExtent(text, DRAW_FLAGS).y;
-	});
-
-	trim.height += textHeight + CLIENT_INSET * 2;
-
+	trim.height += textExtent.y + CLIENT_INSET * 2;
 	return DPIUtil.autoScaleUp(trim);
 }
 
@@ -235,32 +226,29 @@ public void setEnabled(boolean enabled) {
 
 @Override
 void enableWidget(boolean enabled) {
-	this.enabled = enabled;
-	for (Control child : getChildren()) {
-		child.setEnabled(enabled);
-	}
-	if (text != null && !text.isEmpty()) {
-		redraw();
-	}
+	super.enableWidget(enabled);
+}
+
+@Override
+public boolean isEnabled() {
+	checkWidget();
+	return getEnabled() && parent.isEnabled();
 }
 
 @Override
-Rectangle getClientAreaInPixels() {
+public Rectangle getClientArea() {
 	checkWidget();
-	Rectangle rect = super.getClientAreaInPixels();
+	Rectangle rect = super.getClientArea();
 	if (rect.isEmpty())
 		return rect;
 
 	int y = 5;
 	if (text != null && !text.isEmpty()) {
-		y = Drawing.executeOnGC(this, gc -> {
-			gc.setFont(getFont());
-			return gc.textExtent(text, DRAW_FLAGS).y - 5;
-		});
+		y = textExtent.y - 5;
 	}
+	return new Rectangle(rect.x + CLIENT_INSET, y, Math.max(0, rect.width - CLIENT_INSET * 2),
+			Math.max(0, rect.height - CLIENT_INSET * 6));
 
-	return DPIUtil.autoScaleUp(new Rectangle(CLIENT_INSET, y, Math.max(0, rect.width - CLIENT_INSET * 2),
-			Math.max(0, rect.height - CLIENT_INSET * 5)));
 }
 
 @Override
@@ -298,90 +286,15 @@ boolean mnemonicMatch(char key) {
 	return Character.toUpperCase(key) == Character.toUpperCase(mnemonic);
 }
 
-//@Override
-//void printWidget (long hwnd, long hdc, GC gc) {
-//	/*
-//	* Bug in Windows.  For some reason, PrintWindow()
-//	* returns success but does nothing when it is called
-//	* on a printer.  The fix is to just go directly to
-//	* WM_PRINT in this case.
-//	*/
-//	boolean success = false;
-//	NativeGC ngc = (NativeGC) gc.innerGC;
-//	if (!(OS.GetDeviceCaps(ngc.handle, OS.TECHNOLOGY) == OS.DT_RASPRINTER)) {
-//		int bits = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
-//		if ((bits & OS.WS_VISIBLE) == 0) {
-//			OS.ShowWindow (hwnd, OS.SW_SHOW);
-//		}
-//		success = OS.PrintWindow (hwnd, hdc, 0);
-//		if ((bits & OS.WS_VISIBLE) == 0) {
-//			OS.ShowWindow (hwnd, OS.SW_HIDE);
-//		}
-//	}
-//
-//	/*
-//	* Bug in Windows.  For some reason, PrintWindow() fails
-//	* when it is called on a push button.  The fix is to
-//	* detect the failure and use WM_PRINT instead.  Note
-//	* that WM_PRINT cannot be used all the time because it
-//	* fails for browser controls when the browser has focus.
-//	*/
-//	if (!success) {
-//		/*
-//		* Bug in Windows.  For some reason, WM_PRINT when called
-//		* with PRF_CHILDREN will not draw the tool bar divider
-//		* for tool bar children that do not have CCS_NODIVIDER.
-//		* The fix is to draw the group box and iterate through
-//		* the children, drawing each one.
-//		*/
-//		int flags = OS.PRF_CLIENT | OS.PRF_NONCLIENT | OS.PRF_ERASEBKGND;
-//		OS.SendMessage (hwnd, OS.WM_PRINT, hdc, flags);
-//		int nSavedDC = OS.SaveDC (hdc);
-//		Control [] children = _getChildren ();
-//		Rectangle rect = getBoundsInPixels ();
-//		OS.IntersectClipRect (hdc, 0, 0, rect.width, rect.height);
-//		for (int i=children.length - 1; i>=0; --i) {
-//			Point location = children [i].getLocationInPixels ();
-//			int graphicsMode = OS.GetGraphicsMode(hdc);
-//			if (graphicsMode == OS.GM_ADVANCED) {
-//				float [] lpXform = {1, 0, 0, 1, location.x, location.y};
-//				OS.ModifyWorldTransform(hdc, lpXform, OS.MWT_LEFTMULTIPLY);
-//			} else {
-//				OS.SetWindowOrgEx (hdc, -location.x, -location.y, null);
-//			}
-//			long topHandle = children [i].topHandle();
-//			int bits = OS.GetWindowLong (topHandle, OS.GWL_STYLE);
-//			if ((bits & OS.WS_VISIBLE) != 0) {
-//				children [i].printWidget (topHandle, hdc, gc);
-//			}
-//			if (graphicsMode == OS.GM_ADVANCED) {
-//				float [] lpXform = {1, 0, 0, 1, -location.x, -location.y};
-//				OS.ModifyWorldTransform(hdc, lpXform, OS.MWT_LEFTMULTIPLY);
-//			}
-//		}
-//		OS.RestoreDC (hdc, nSavedDC);
-//	}
-//}
-
-//@Override
-//void releaseWidget () {
-//	super.releaseWidget ();
-//	text = null;
-//}
-
-//@Override
-//int resolveTextDirection () {
-//	return BidiUtil.resolveTextDirection (text);
-//}
-
 @Override
 public void setFont(Font font) {
 	checkWidget();
 	Rectangle oldRect = getClientAreaInPixels();
 	super.setFont(font);
 	Rectangle newRect = getClientAreaInPixels();
-	if (!oldRect.equals(newRect))
+	if (!oldRect.equals(newRect)) {
 		sendResize();
+	}
 }
 
 /**
@@ -425,7 +338,15 @@ public void setText(String text) {
 	if (!text.equals(this.text)) {
 		this.text = text;
 		redraw();
+		textExtent = Drawing.executeOnGC(this, gc -> {
+			gc.setFont(getFont());
+			return gc.textExtent(this.text, DRAW_FLAGS);
+		});
 	}
+}
 
+@Override
+void printWidget(long hwnd, long hdc, GC gc) {
+	System.err.println("printWidget of Group is not implemented yet.");
 }
 }