Revert "Bug 493391 - Unnatural button order in File Search dialog with GTK3"
This reverts commit a92260f6e772b15edb91162be438f41723cfa160.
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 6bfe7dd..fcd9e97 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 @@
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 @@
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();
}
