mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

WrapLayout can now force components to have a specific size. This allows the use of WrapLayout in many of the places we earlier had fixed column based layouts with GridLayout.

This commit is contained in:
Stian Grenborgen 2024-01-05 19:59:00 +01:00
parent a45d17226a
commit 9d36d7ef4a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/sf/freecol/client/gui/panel/WrapLayout.java
View File

@ -96,6 +96,7 @@ public class WrapLayout implements LayoutManager {
private HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER;
private LayoutStyle layoutStyle = LayoutStyle.BALANCED;
private HorizontalGap horizontalGap = HorizontalGap.AUTO;
private Dimension forceComponentSize = null;
private int minHorizontalGap = 0;
private int minVerticalGap = 0;
@ -166,6 +167,17 @@ public class WrapLayout implements LayoutManager {
this.maxHorizontalGap = maxHorizontalGap;
return this;
}
/**
* Forces all child components to have the given size.
*
* @param forceComponentSize The component size.
* @return This object, in order to support method chaining.
*/
public WrapLayout withForceComponentSize(Dimension forceComponentSize) {
this.forceComponentSize = forceComponentSize;
return this;
}
/**
* Returns the preferred dimensions for this layout given the <i>visible</i>
@ -259,6 +271,9 @@ public class WrapLayout implements LayoutManager {
Dimension currentRowSize = new Dimension(0, 0);
for (Component component : getVisibleComponents(target, layoutBottomToTop)) {
Dimension d = preferred ? component.getPreferredSize() : component.getMinimumSize();
if (forceComponentSize != null) {
d = forceComponentSize;
}
// Can't add the component to current row. Start a new row.
if (currentRowSize.width + d.width > maxWidth) {