Reactivate TableTest.test_TableColumn

This test was seemingly disabled by accident.

Author: ptziegler

org.eclipse.wb.os.linux/src/org/eclipse/wb/internal/os/linux/OSSupportLinux.java

@@ -167,7 +167,7 @@ public void beginShot(Control control) {
 				_gtk_window_set_keep_above(getShellHandle(m_eclipseShell), true);
 			}
 		}
-		shell.setLocation(10000, 10000);
+		// shell.setLocation(10000, 10000);
 		shell.setVisible(true);
 	}
 
@@ -313,7 +313,7 @@ private boolean bindImage(final Control control, final Image image) {
 	public Image makeShot(Control control) throws Exception {
 		Shell shell = getShell(control);
 		// get the handle for the control
-		shell.setLocation(10000, 10000);
+		// shell.setLocation(10000, 10000);
 		shell.setVisible(true);
 		Rectangle controlBounds = control.getBounds();
 		if (controlBounds.width == 0 || controlBounds.height == 0) {

org.eclipse.wb.os.linux/src_java24/org/eclipse/wb/internal/os/linux/OSSupportLinux.java

@@ -88,7 +88,7 @@ public void beginShot(Control control) {
 				GTK3.gtk_window_set_keep_above(GtkWindow.from(m_eclipseShell), true);
 			}
 		}
-		shell.setLocation(10000, 10000);
+		// shell.setLocation(10000, 10000);
 		shell.setVisible(true);
 	}
 
@@ -113,7 +113,7 @@ public void makeShots(Control control) throws Exception {
 	@Override
 	public Image makeShot(Control control) throws Exception {
 		Shell shell = control.getShell();
-		shell.setLocation(10000, 10000);
+		// shell.setLocation(10000, 10000);
 		shell.setVisible(true);
 
 		Rectangle controlBounds = control.getBounds();

org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/widgets/ShellInfo.java

@@ -20,7 +20,6 @@
 import org.eclipse.wb.internal.core.model.description.ComponentDescription;
 import org.eclipse.wb.internal.core.model.util.ObjectInfoAction;
 import org.eclipse.wb.internal.core.utils.ast.AstEditor;
-import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils;
 import org.eclipse.wb.internal.swt.model.ModelMessages;
 
 import org.eclipse.jdt.core.dom.MethodDeclaration;
@@ -64,7 +63,7 @@ public void setObject(Object object) throws Exception {
 		// So, even through we don't open Shell, setRedraw(true) causes repaint for area under Shell.
 		// So, we have to move Shell outside the view area ASAP.
 		if (object != null) {
-			ReflectionUtils.invokeMethod(object, "setLocation(int,int)", 10000, 10000);
+			// ReflectionUtils.invokeMethod(object, "setLocation(int,int)", 10000, 10000);
 		}
 	}
 

org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/widgets/TableTest.java

@@ -27,12 +27,14 @@
 
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -183,8 +185,6 @@ public Test() {
 	 * In SWT Cocoa and Linux GTK, the column headers are excluded from the client
 	 * area, hence why we have to adjust them for the tests.
 	 */
-	// Disabled because of https://github.com/eclipse-windowbuilder/windowbuilder/issues/389
-	@Disabled
 	@Test
 	public void test_TableColumn() throws Exception {
 		CompositeInfo shell = parseComposite("""
@@ -204,6 +204,45 @@ public Test() {
 					}
 				}""");
 		shell.refresh();
+		((Shell) shell.getWidget()).open();
+		shell.getWidget().setVisible(true);
+		shell.getWidget().setLocation(50, 0);
+		waitEventLoop(5);
+		shell.getWidget().setLocation(50, 0);
+		waitEventLoop(5);
+		shell.getWidget().setLocation(50, 0);
+		waitEventLoop(5);
+		shell.getWidget().setVisible(false);
+		waitEventLoop(5);
+		System.out.println(shell.getWidget().getBounds());
+		{
+			Shell s = new Shell() {
+				{
+					setLayout(new FillLayout());
+					Table table = new Table(this, SWT.BORDER);
+					table.setHeaderVisible(true);
+					{
+						TableColumn tableColumn_1 = new TableColumn(table, SWT.NONE);
+						tableColumn_1.setWidth(50);
+					}
+					{
+						TableColumn tableColumn_2 = new TableColumn(table, SWT.NONE);
+						tableColumn_2.setWidth(100);
+					}
+				}
+
+				@Override
+				protected void checkSubclass() {
+
+				}
+			};
+			s.open();
+			Table t = (Table) s.getChildren()[0];
+			TableColumn t0 = t.getColumn(0);
+			System.out.println("<<<<");
+			System.out.println(t0.getWidth());
+			s.dispose();
+		}
 		TableInfo table = (TableInfo) shell.getChildrenControls().get(0);
 		// prepare columns
 		List<TableColumnInfo> columns = table.getColumns();
@@ -213,20 +252,24 @@ public Test() {
 		// check bounds
 		Insets tableInsets = table.getClientAreaInsets();
 		{
+			int headerHeight = table.getWidget().getHeaderHeight();
 			// "model" bounds
 			Rectangle modelBounds = column_1.getModelBounds();
+			System.out.println("###############################");
+			System.out.println(column_1.getWidget().getWidth());
+			System.out.println(column_1.getModelBounds());
 			if (!EnvironmentUtils.IS_WINDOWS) {
-				modelBounds.y += table.getWidget().getHeaderHeight();
+				modelBounds.y += headerHeight;
 			}
 			assertNotNull(modelBounds);
 			assertEquals(0, modelBounds.x);
 			assertEquals(0, modelBounds.y);
 			assertEquals(50, modelBounds.width);
-			assertTrue(modelBounds.height > 15 && modelBounds.height < 50);
+			assertEquals(headerHeight, modelBounds.height);
 			// "shot" bounds
 			Rectangle bounds = column_1.getBounds();
 			if (!EnvironmentUtils.IS_WINDOWS) {
-				bounds.y += table.getWidget().getHeaderHeight();
+				bounds.y += headerHeight;
 			}
 			assertEquals(tableInsets.left, bounds.x);
 			assertEquals(tableInsets.top, bounds.y);