You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2021/09/03 15:55:03 UTC
[jmeter] branch master updated: Revert "SplitPanel shows a
scrollbar instead of shrinking the right panel in the main view"
This is an automated email from the ASF dual-hosted git repository.
fschumacher 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 093df18 Revert "SplitPanel shows a scrollbar instead of shrinking the right panel in the main view"
093df18 is described below
commit 093df18f7c9e5e68d5e617bf2a8f4179281d89a4
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Fri Sep 3 17:49:36 2021 +0200
Revert "SplitPanel shows a scrollbar instead of shrinking the right panel in the main view"
The reported problem was fixed with the patch (that is reverted here), but the Tree Results View
was broken with it. So revert it for now.
This reverts commit 2e7c471734cf666b9e43f5613a740060c899a923.
This reverts commit a7bdcb24a379ee804c200bfa3a119891c2875614.
Bugzilla Id: 65545
---
.../src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java | 7 +++----
xdocs/changes.xml | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
index ffbb8d5..4d72f72 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/VerticalPanel.java
@@ -17,6 +17,7 @@
package org.apache.jmeter.gui.util;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -24,8 +25,6 @@ import javax.swing.Box;
import javax.swing.JComponent;
import javax.swing.JPanel;
-import net.miginfocom.swing.MigLayout;
-
public class VerticalPanel extends JPanel {
private static final long serialVersionUID = 240L;
@@ -46,8 +45,8 @@ public class VerticalPanel extends JPanel {
}
public VerticalPanel(int vgap, float horizontalAlign) {
- super(new MigLayout("fillx, wrap 1, insets 0", "[95%!,fill,grow]"));
- add(subPanel, "north");
+ super(new BorderLayout());
+ add(subPanel, BorderLayout.NORTH);
this.vgap = vgap;
this.horizontalAlign = horizontalAlign;
}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b562278..d9aca2d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -242,7 +242,6 @@ Summary
<li><bug>65300</bug>IllegalAccessError when opening file dialog with Java 16</li>
<li><bug>65336</bug>Blank labels when different elements had the same name</li>
<li><bug>65522</bug>Restart doesn't work, when parameters contain spaces</li>
- <li><bug>65545</bug>SplitPanel shows a scrollbar instead of shrinking the right panel in the main view</li>
</ul>
<!-- =================== Thanks =================== -->