From ea7b7b5b26270cc4bef44bf2b1b9970b2082322b Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 19 Aug 2018 16:37:12 +0200 Subject: [PATCH] Focus default button in PullResultDialog Avoid the system automatically focusing the first focusable result, the text widget with the rebase/merge status result. Change-Id: I8fa041944a98d9ee70711733141d6bcd9065068b Signed-off-by: Michael Keppler Bug:538066 --- .../src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java index 6c98203b4..226d50604 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java @@ -35,6 +35,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; @@ -148,9 +149,10 @@ public class PullResultDialog extends Dialog { @Override protected void createButtonsForButtonBar(Composite parent) { - createButton(parent, IDialogConstants.OK_ID, + Button okayButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL, true); + okayButton.setFocus(); } @Override -- 2.11.4.GIT