Change the toolbar container to also be a toolbar and use an empty bo…

…rder for the toolbar itself.
apache · Mar 19, 2020 · 44b193f · 44b193f
1 parent c06f048
commit 44b193f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -56,7 +56,6 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
-import javax.swing.BoxLayout;
 import javax.swing.DropMode;
 import javax.swing.ImageIcon;
 import javax.swing.InputMap;
@@ -66,6 +65,7 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
+import javax.swing.JToolBar;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
@@ -585,7 +585,8 @@ public void setExtendedFrameTitle(String fname) {
      * @return a panel containing the running indicator
      */
     private Component createToolBar() {
-        Box toolPanel = new Box(BoxLayout.X_AXIS);
+        JToolBar toolPanel = new JToolBar();
+        toolPanel.setFloatable(false);
         // add the toolbar
         this.toolbar = JMeterToolBar.createToolbar(true);
         GuiPackage guiInstance = GuiPackage.getInstance();

diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
@@ -78,6 +79,7 @@ public static JMeterToolBar createToolbar(boolean visible) {
         JMeterToolBar toolBar = new JMeterToolBar();
         toolBar.setFloatable(false);
         toolBar.setVisible(visible);
+        toolBar.setBorder(BorderFactory.createEmptyBorder());
 
         setupToolbarContent(toolBar);
         JMeterUtils.addLocaleChangeListener(toolBar);