[jmeter] branch master updated: Change the toolbar container to also be a toolbar and use an empty border for the toolbar itself.

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c734dd  Change the toolbar container to also be a toolbar and use an 
empty border for the toolbar itself.
1c734dd is described below

commit 1c734dd58c1cc633bb46cbb5594efe3d3925dd93
Author: weisj <we...@arcor.de>
AuthorDate: Thu Mar 19 14:21:17 2020 +0100

    Change the toolbar container to also be a toolbar and use an empty border 
for the toolbar itself.
---
 src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java | 6 ++----
 1 file changed, 2 insertions(+), 4 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
index c550a4e..7c51ac0 100644
--- 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.AbstractAction;
 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;
@@ -586,12 +585,11 @@ public class MainFrame extends JFrame implements 
TestStateListener, Remoteable,
      * @return a panel containing the running indicator
      */
     private Component createToolBar() {
-        Box toolPanel = new Box(BoxLayout.X_AXIS);
+        JMeterToolBar toolPanel = JMeterToolBar.createToolbar(true);
         // add the toolbar
-        this.toolbar = JMeterToolBar.createToolbar(true);
+        this.toolbar = toolPanel;
         GuiPackage guiInstance = GuiPackage.getInstance();
         guiInstance.setMainToolbar(toolbar);
-        toolPanel.add(toolbar);
 
         toolPanel.add(Box.createRigidArea(new Dimension(5, 15)));
         toolPanel.add(Box.createGlue());