diff options
author | Markus Keller | 2016-07-15 19:27:28 +0000 |
---|---|---|
committer | Markus Keller | 2016-07-15 19:27:55 +0000 |
commit | 2a561923273f250ce2c9e231bfea33537107abb4 (patch) | |
tree | 9ffe8b810f14c45ee194c478ffc2e6c51d706ce3 /org.eclipse.search/search/org | |
parent | c9a89731e6b9753148a8e063bed667637dcc0fb4 (diff) | |
download | eclipse.platform.text-2a561923273f250ce2c9e231bfea33537107abb4.tar.gz eclipse.platform.text-2a561923273f250ce2c9e231bfea33537107abb4.tar.xz eclipse.platform.text-2a561923273f250ce2c9e231bfea33537107abb4.zip |
Revert "Bug 493391 - Unnatural button order in File Search dialog with GTK3"Y20160721-1000I20160719-0800I20160716-1900
This reverts commit a92260f6e772b15edb91162be438f41723cfa160.
Diffstat (limited to 'org.eclipse.search/search/org')
-rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index 6bfe7dd51f4..fcd9e975652 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -504,18 +504,11 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon filler.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL)); layout.numColumns++; - super.createButtonsForButtonBar(composite); // cancel button - - /* - * Replace button now uses the GridData layout data that has exclusion flags so - * the layout will ignore the widget when hidden, leaving no empty space between Cancel and Search buttons. - */ fReplaceButton= createActionButton(composite, REPLACE_ID, SearchMessages.SearchDialog_replaceAction, true); - GridData fReplaceButtonData = new GridData(); - fReplaceButtonData.exclude = false; - fReplaceButton.setLayoutData(fReplaceButtonData); + fReplaceButton.setVisible(fCurrentPage instanceof IReplacePage); Button searchButton= createActionButton(composite, SEARCH_ID, SearchMessages.SearchDialog_searchAction, true); searchButton.setEnabled(fDescriptors.size() > 0); + super.createButtonsForButtonBar(composite); // cancel button return composite; } @@ -606,12 +599,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon if (pageControl instanceof Composite) ((Composite)pageControl).layout(false, true); } - - // set visibility of replace button using its GridData.exclude to hide/show the button without empty space - GridData fReplaceButtonDataPrev = (GridData) fReplaceButton.getLayoutData(); - fReplaceButtonDataPrev.exclude = !(fCurrentPage instanceof IReplacePage); - fReplaceButton.setVisible(!fReplaceButtonDataPrev.exclude); - fReplaceButton.getParent().layout(false); + fReplaceButton.setVisible(fCurrentPage instanceof IReplacePage); notifyPageChanged(); } |