Skip to content

Commit

Permalink
Wrap Rules tab buttons on smaller window sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
ddwightx committed Dec 21, 2020
1 parent 90db03c commit 4a4e52f
Show file tree
Hide file tree
Showing 6 changed files with 202 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group 'com.synfron.reshaper.burp'
version '1.0.1-SNAPSHOT'
version '1.0.1'

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import synfron.reshaper.burp.core.events.PropertyChangedArgs;
import synfron.reshaper.burp.core.rules.Rule;
import synfron.reshaper.burp.ui.models.rules.RuleModel;
import synfron.reshaper.burp.ui.utils.WrapLayout;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
Expand Down Expand Up @@ -112,7 +113,7 @@ private void onRulesCollectionChanged(CollectionChangedArgs collectionChangedArg
}

private Component getActionBar() {
JPanel actionBar = new JPanel();
JPanel actionBar = new JPanel(new WrapLayout());

JButton add = new JButton("Add");
JButton moveUp = new JButton("Move Up");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import synfron.reshaper.burp.ui.models.rules.RuleModel;
import synfron.reshaper.burp.ui.models.rules.RuleOperationModel;
import synfron.reshaper.burp.ui.models.rules.RuleOperationModelType;
import synfron.reshaper.burp.ui.utils.WrapLayout;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
Expand Down Expand Up @@ -90,7 +91,7 @@ private Component getOperationsList() {
}

private Component getActionBar() {
JPanel actionBar = new JPanel(new FlowLayout(FlowLayout.RIGHT));
JPanel actionBar = new JPanel(new WrapLayout(FlowLayout.RIGHT));

JButton moveUp = new JButton("Move Up");
JButton moveDown = new JButton("Move Down");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ private void initComponent() {
ruleList.setSelectionContainer(ruleContainer);

JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, ruleList, ruleContainer);
splitPane.setDividerLocation(ruleList.getPreferredSize().width);
splitPane.setDividerSize(3);

add(splitPane);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ private void initComponent() {
variablesList.setSelectionContainer(variableContainer);

JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, variablesList, variableContainer);
splitPane.setDividerSize(3);

add(splitPane);
}
Expand Down
194 changes: 194 additions & 0 deletions src/main/java/synfron/reshaper/burp/ui/utils/WrapLayout.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
package synfron.reshaper.burp.ui.utils;
import javax.swing.*;
import java.awt.*;

/**
* FlowLayout subclass that fully supports wrapping of components.
*
* @author Rob Camick
* https://tips4java.wordpress.com/2008/11/06/wrap-layout/
* http://www.camick.com/java/source/WrapLayout.java
*/
public class WrapLayout extends FlowLayout
{
private Dimension preferredLayoutSize;

/**
* Constructs a new <code>WrapLayout</code> with a left
* alignment and a default 5-unit horizontal and vertical gap.
*/
public WrapLayout()
{
super();
}

/**
* Constructs a new <code>FlowLayout</code> with the specified
* alignment and a default 5-unit horizontal and vertical gap.
* The value of the alignment argument must be one of
* <code>WrapLayout</code>, <code>WrapLayout</code>,
* or <code>WrapLayout</code>.
* @param align the alignment value
*/
public WrapLayout(int align)
{
super(align);
}

/**
* Creates a new flow layout manager with the indicated alignment
* and the indicated horizontal and vertical gaps.
* <p>
* The value of the alignment argument must be one of
* <code>WrapLayout</code>, <code>WrapLayout</code>,
* or <code>WrapLayout</code>.
* @param align the alignment value
* @param hgap the horizontal gap between components
* @param vgap the vertical gap between components
*/
public WrapLayout(int align, int hgap, int vgap)
{
super(align, hgap, vgap);
}

/**
* Returns the preferred dimensions for this layout given the
* <i>visible</i> components in the specified target container.
* @param target the component which needs to be laid out
* @return the preferred dimensions to lay out the
* subcomponents of the specified container
*/
@Override
public Dimension preferredLayoutSize(Container target)
{
return layoutSize(target, true);
}

/**
* Returns the minimum dimensions needed to layout the <i>visible</i>
* components contained in the specified target container.
* @param target the component which needs to be laid out
* @return the minimum dimensions to lay out the
* subcomponents of the specified container
*/
@Override
public Dimension minimumLayoutSize(Container target)
{
Dimension minimum = layoutSize(target, false);
minimum.width -= (getHgap() + 1);
return minimum;
}

/**
* Returns the minimum or preferred dimension needed to layout the target
* container.
*
* @param target target to get layout size for
* @param preferred should preferred size be calculated
* @return the dimension to layout the target container
*/
private Dimension layoutSize(Container target, boolean preferred)
{
synchronized (target.getTreeLock())
{
// Each row must fit with the width allocated to the containter.
// When the container width = 0, the preferred width of the container
// has not yet been calculated so lets ask for the maximum.

int targetWidth = target.getSize().width;
Container container = target;

while (container.getSize().width == 0 && container.getParent() != null)
{
container = container.getParent();
}

targetWidth = container.getSize().width;

if (targetWidth == 0)
targetWidth = Integer.MAX_VALUE;

int hgap = getHgap();
int vgap = getVgap();
Insets insets = target.getInsets();
int horizontalInsetsAndGap = insets.left + insets.right + (hgap * 2);
int maxWidth = targetWidth - horizontalInsetsAndGap;

// Fit components into the allowed width

Dimension dim = new Dimension(0, 0);
int rowWidth = 0;
int rowHeight = 0;

int nmembers = target.getComponentCount();

for (int i = 0; i < nmembers; i++)
{
Component m = target.getComponent(i);

if (m.isVisible())
{
Dimension d = preferred ? m.getPreferredSize() : m.getMinimumSize();

// Can't add the component to current row. Start a new row.

if (rowWidth + d.width > maxWidth)
{
addRow(dim, rowWidth, rowHeight);
rowWidth = 0;
rowHeight = 0;
}

// Add a horizontal gap for all components after the first

if (rowWidth != 0)
{
rowWidth += hgap;
}

rowWidth += d.width;
rowHeight = Math.max(rowHeight, d.height);
}
}

addRow(dim, rowWidth, rowHeight);

dim.width += horizontalInsetsAndGap;
dim.height += insets.top + insets.bottom + vgap * 2;

// When using a scroll pane or the DecoratedLookAndFeel we need to
// make sure the preferred size is less than the size of the
// target containter so shrinking the container size works
// correctly. Removing the horizontal gap is an easy way to do this.

Container scrollPane = SwingUtilities.getAncestorOfClass(JScrollPane.class, target);

if (scrollPane != null && target.isValid())
{
dim.width -= (hgap + 1);
}

return dim;
}
}

/*
* A new row has been completed. Use the dimensions of this row
* to update the preferred size for the container.
*
* @param dim update the width and height when appropriate
* @param rowWidth the width of the row to add
* @param rowHeight the height of the row to add
*/
private void addRow(Dimension dim, int rowWidth, int rowHeight)
{
dim.width = Math.max(dim.width, rowWidth);

if (dim.height > 0)
{
dim.height += getVgap();
}

dim.height += rowHeight;
}
}

0 comments on commit 4a4e52f

Please sign in to comment.