# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1321900088 -3600
# Node ID 6157f507b7dfa37f6dbb044e93f243cdc40c5629
# Parent  6cadc61ca6041a910c98a2ecc050b72866a2e6aa# Parent  9482471a7dfaa8288d857c1a140639be3dc04650
Merge.

diff -r 6cadc61ca604 -r 6157f507b7df src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java	Mon Nov 21 19:27:54 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java	Mon Nov 21 19:28:08 2011 +0100
@@ -287,11 +287,12 @@
         interactionButtons.add(button);
         toolBar.add(button);
         selectionModeAction.addPropertyChangeListener(this);
-        
+
         toolBar.add(Box.createHorizontalGlue());
         Action action = Utilities.actionsForPath("QuickSearchShadow").get(0);
         Component quicksearch = ((Presenter.Toolbar) action).getToolbarPresenter();
-        toolBar.add(quicksearch, BorderLayout.CENTER);
+        quicksearch.setMinimumSize(quicksearch.getPreferredSize()); // necessary for GTK LAF
+        toolBar.add(quicksearch);
 
         centerPanel = new JPanel();
         this.add(centerPanel, BorderLayout.CENTER);