commit 1999afb2acc5817ed89356260272bda63b61529b
author Dariusz Stefanowicz <dario@parasoft.com> Sun Aug 30 13:09:59 2015 +0200
committer Brian de Alwis <bsd@mt.ca> Tue Nov 24 10:40:19 2015 -0500
tree 79cbb99c0fdc6a20b8c69a78c0a9492eddbe5271
parent b5f5cde94ad4cf548327e3e23ede3f676649497d

Fixed bug 475480: PreferencePage.contributeButtons - custom buttons layout problem
(backport to 4.5.2)

Fixed problem with custom buttons layout added using contributeButtons method.

Change-Id: Ia7692cb5e3b9c2c3fa5f0433f8616a0f3a7cfea1
Signed-off-by: Dariusz Stefanowicz <dario@parasoft.com>

bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferencePage.java

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferencePage.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferencePage.java
index 476e6c6..6a632db 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferencePage.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferencePage.java
@@ -259,7 +259,7 @@
         contributeButtons(buttonBar);
 
 		if (createApplyButton || createDefaultButton) {
-			layout.numColumns = 1 + (createApplyButton && createDefaultButton ? 1 : 0);
+			layout.numColumns += 1 + (createApplyButton && createDefaultButton ? 1 : 0);
 			int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
 
 			if (createDefaultButton) {