Merge pull request #6929 from bndtools/size_improvements

improve size configuration

Author: peterkir

bndtools.core/src/bndtools/editor/BndSourceEffectivePage.java

@@ -63,6 +63,7 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
@@ -557,7 +558,15 @@ private void createCustomToolTipSupport(TableViewer tableViewer, List<CellLabelP
 			false) {
 			@Override
 			protected Composite createToolTipContentArea(Event event, Composite parent) {
+				// Define tooltip size constants
+				final int TOOLTIP_WIDTH = 700;
+				final int TOOLTIP_HEIGHT = 300;
+				
 				Composite container = new Composite(parent, SWT.NONE);
+
+				if (parent instanceof Shell) {
+					parent.setSize(TOOLTIP_WIDTH, TOOLTIP_HEIGHT);
+				}
 				container.setLayout(new GridLayout(1, false));
 
 				// unfortunatelly lots of ceremony to
@@ -598,8 +607,8 @@ protected Composite createToolTipContentArea(Event event, Composite parent) {
 				text.setMargins(5, 5, 5, 5); // left, top, right, bottom
 
 				GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-				gd.widthHint = 350;
-				gd.heightHint = 200;
+				gd.widthHint = TOOLTIP_WIDTH - 50; // Account for margins and scrollbars
+				gd.heightHint = TOOLTIP_HEIGHT - 80; // Account for margins, scrollbars, and toolbar
 				text.setLayoutData(gd);
 				text.setText(tooltipText);
 

bndtools.core/src/bndtools/wizards/newworkspace/NewWorkspaceWizard.java

@@ -28,6 +28,8 @@
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.program.Program;
@@ -36,6 +38,7 @@
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IImportWizard;
@@ -62,13 +65,12 @@
  */
 public class NewWorkspaceWizard extends Wizard implements IImportWizard, INewWizard {
 
-
-	static final Logger				log				= LoggerFactory.getLogger(NewWorkspaceWizard.class);
+	static final Logger				log					= LoggerFactory.getLogger(NewWorkspaceWizard.class);
 
 	final Model						model;
 	final UI<Model>					ui;
-	final NewWorkspaceWizardPage	page			= new NewWorkspaceWizardPage();
-	final FragmentTemplateEngine			templates;
+	final NewWorkspaceWizardPage	page				= new NewWorkspaceWizardPage();
+	final FragmentTemplateEngine	templates;
 
 	final static Image				verified			= Icons.image("icons/tick.png", false);
 	final static Image				verifiedGreyedOut	= new Image(Display.getDefault(), verified, SWT.IMAGE_DISABLE);
@@ -124,8 +126,7 @@ public boolean performFinish() {
 		// show a confirmation dialog
 		// if there is at least one 3rd-party template selected
 		long num3rdParty = model.selectedTemplates.stream()
-			.filter(t -> !t
-				.isOfficial())
+			.filter(t -> !t.isOfficial())
 			.count();
 
 		boolean confirmed = num3rdParty == 0 || openConfirm(getShell(), "Install 3rd-Party templates",
@@ -146,7 +147,6 @@ public boolean performFinish() {
 		} else
 			return false;
 
-
 	}
 
 	class NewWorkspaceWizardPage extends WizardPage {
@@ -244,12 +244,10 @@ public String getText(Object element) {
 				@Override
 				public String getText(Object element) {
 					if (element instanceof TemplateInfo ti) {
-						if (ti
-							.isOfficial()) {
+						if (ti.isOfficial()) {
 							return "bndtools (Official)";
 
-						}
-						else {
+						} else {
 							return ti.id()
 								.organisation() + " (3rd Party)";
 						}
@@ -269,9 +267,8 @@ public Image getImage(Object element) {
 
 			});
 
-
-			tableLayout.addColumnData(new ColumnWeightData(1, 150, false));
-			tableLayout.addColumnData(new ColumnWeightData(10, 400, true));
+			tableLayout.addColumnData(new ColumnWeightData(1, 200, false));
+			tableLayout.addColumnData(new ColumnWeightData(10, 460, true));
 			tableLayout.addColumnData(new ColumnWeightData(20, 100, true));
 
 			Button addButton = new Button(container, SWT.PUSH);
@@ -308,10 +305,32 @@ public Image getImage(Object element) {
 			UI.checkbox(browseButton)
 				.subscribe(this::browseForLocation);
 
-			getShell().setSize(840, 480);
+			centerShell();
 			ui.update();
 		}
 
+		private void centerShell() {
+			Shell shell = getShell();
+			shell.setSize(840, 480);
+			Shell parent = (Shell) shell.getParent();
+			if (parent != null) {
+				Rectangle parentBounds = parent.getBounds();
+				Point shellSize = shell.getSize();
+				int x = parentBounds.x + (parentBounds.width - shellSize.x) / 2;
+				int y = parentBounds.y + (parentBounds.height - shellSize.y) / 2;
+				shell.setLocation(x, y);
+			} else {
+				// If no parent, center on the display
+				Rectangle displayBounds = shell.getDisplay()
+					.getPrimaryMonitor()
+					.getBounds();
+				Point shellSize = shell.getSize();
+				int x = (displayBounds.width - shellSize.x) / 2;
+				int y = (displayBounds.height - shellSize.y) / 2;
+				shell.setLocation(x, y);
+			}
+		}
+
 		List<TemplateInfo> toTemplates(Object[] selection) {
 			return Stream.of(selection)
 				.map(o -> (TemplateInfo) o)

bndtools.test/workspace/.gitignore

@@ -5,6 +5,12 @@ Archive
 .DS_Store
 .*.swp
 /.gradle/
-/reports/
+/bin/
 /generated/
+/reports/
+/install-jdk.sh
 .to
+.idea
+.settings
+.flattened-pom.xml
+target/