Google GitGoogle Git
Sign in
eclipse/platform/eclipse.platform.team/c3df42bfbe1839c769b7e7040a7c8ba77e2155a3^!/.
commit
c3df42bfbe1839c769b7e7040a7c8ba77e2155a3
[log]
author
Zsombor Gegesy <gzsombor@gmail.com>
Thu Mar 03 10:32:14 2022 +0100
committer
Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Mon Mar 14 04:34:16 2022 -0400
tree
58ff002d348d86ba3fbf6b0b3378e84748662924
parent
1f890c1ba2300921c0ae8020ccb48cbd16e92824 [diff]
Bug 579103 - fix layout of the TextPreferencePage

Change-Id: Id6eea00873b4736fc9624a4185131ec724f58190
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/191508
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

diff --git a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
index ab8bee1..6fe5d20 100644
--- a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true
-Bundle-Version: 3.9.200.qualifier
+Bundle-Version: 3.9.300.qualifier
 Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/bundles/org.eclipse.team.ui/pom.xml b/bundles/org.eclipse.team.ui/pom.xml
index 78431fc..fb7fb26 100644
--- a/bundles/org.eclipse.team.ui/pom.xml
+++ b/bundles/org.eclipse.team.ui/pom.xml

@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.ui</artifactId>
-  <version>3.9.200-SNAPSHOT</version>
+  <version>3.9.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java
index dec006f..c91dad7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java

@@ -31,6 +31,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.TableEditor;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
@@ -114,8 +115,10 @@
 		/**
 		 * Create a table.
 		 */
-		final Table table = new Table(composite, SWT.V_SCROLL | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-		table.setLayoutData(SWTUtils.createHVFillGridData());
+		final Table table = new Table(composite, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
+		var gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+		gd.heightHint = 300;
+		table.setLayoutData(gd);
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true);
 

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java
index bcb9901..10458ad 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -33,6 +32,7 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.team.core.IFileContentManager;
 import org.eclipse.team.core.IStringMapping;
 import org.eclipse.team.core.Team;
@@ -190,12 +190,13 @@
 		fRemoveButton= new Button(buttonsComposite, SWT.PUSH);
 		fRemoveButton.setText(TeamUIMessages.TextPreferencePage_remove);
 
-		SWTUtils.createLabel(composite, TeamUIMessages.TextPreferencePage_1, 2);
+		final var label = new Label(composite, SWT.WRAP);
+		label.setText(TeamUIMessages.TextPreferencePage_1);
+		label.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1));
 
 		/**
 		 * Calculate and set the button size
 		 */
-		applyDialogFont(composite);
 		final int buttonWidth= SWTUtils.calculateControlSize(converter, new Button [] { addExtensionButton, addNameButton, fChangeButton, fRemoveButton });
 		addExtensionButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.FILL, false, false));
 		addNameButton.setLayoutData(SWTUtils.createGridData(buttonWidth, SWT.DEFAULT, SWT.FILL, SWT.FILL, false, false));
@@ -211,8 +212,6 @@
 		fRemoveButton.setEnabled(false);
 		fRemoveButton.addListener(SWT.Selection, e -> removePattern());
 
-		Dialog.applyDialogFont(parent);
-
 		// set F1 help
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.FILE_TYPE_PREFERENCE_PAGE);