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

Moving the buttons in the colony panel to the same line as the warehouse. This allows the construction panel to have a larger size. The colony is now automatically reopened after changing the font size and/or scaling factor.

This commit is contained in:
Stian Grenborgen 2024-01-02 18:08:57 +01:00
parent 53fb3c5cf6
commit 4f5d9bc9f9
5 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/net/sf/freecol/client/gui/Canvas.java
View File

@ -289,6 +289,27 @@ public final class Canvas extends JDesktopPane {
repaint();
}
}
public void refreshAllFrames() {
final Component[] components = getComponents();
for (Component c : components) {
if (!(c instanceof JInternalFrame)) {
continue;
}
/*
* Determines a new sensible size.
*/
final JInternalFrame f = (JInternalFrame) c;
if (f.getContentPane() != null
&& f.getContentPane().getComponentCount() > 0
&& f.getContentPane().getComponent(0) instanceof FreeColPanel) {
FreeColPanel fcp = (FreeColPanel) f.getContentPane().getComponent(0);
fcp.refreshLayout();
}
}
updateFrameSizesAndPositions(getSize());
}
private void updateFrameSizesAndPositions(Dimension canvasSize) {
for (Component c : getComponents()) {

2
src/net/sf/freecol/client/gui/SwingGUI.java
View File

@ -1951,6 +1951,8 @@ public class SwingGUI extends GUI {
resetMapControls();
}
canvas.refreshAllFrames();
refresh();
}

70
src/net/sf/freecol/client/gui/panel/ColonyPanel.java
View File

@ -23,6 +23,7 @@ import static net.sf.freecol.common.util.CollectionUtils.dump;
import static net.sf.freecol.common.util.CollectionUtils.sort;
import static net.sf.freecol.common.util.CollectionUtils.transform;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@ -33,8 +34,6 @@ import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
@ -46,15 +45,10 @@ import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.nio.channels.ClosedByInterruptException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@ -73,14 +67,10 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JToolTip;
import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ScrollPaneConstants;
import javax.swing.Scrollable;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
import net.miginfocom.swing.MigLayout;
import net.sf.freecol.client.ClientOptions;
@ -91,7 +81,6 @@ import net.sf.freecol.client.gui.ImageLibrary;
import net.sf.freecol.client.gui.label.GoodsLabel;
import net.sf.freecol.client.gui.label.ProductionLabel;
import net.sf.freecol.client.gui.label.UnitLabel;
import net.sf.freecol.client.gui.mapviewer.TileBounds;
import net.sf.freecol.client.gui.panel.FreeColButton.ButtonStyle;
import net.sf.freecol.client.gui.tooltip.RebelToolTip;
import net.sf.freecol.common.debug.DebugUtils;
@ -410,6 +399,7 @@ public final class ColonyPanel extends PortPanel
cargoScroll.setBorder(null);
constructionPanel = new ConstructionPanel(freeColClient, colony, true);
constructionPanel.setForeground(Color.WHITE);
inPortPanel = new ColonyInPortPanel();
inPortScroll = new JScrollPane(inPortPanel,
@ -453,9 +443,11 @@ public final class ColonyPanel extends PortPanel
}
setBorder(FreeColImageBorder.innerColonyPanelBorder);
initialize(colony);
final Dimension startingSize = freeColClient.getGUI().getFixedImageLibrary().scale(new Dimension(1280, 700));
setColony(colony);
initialize();
final Dimension startingSize = getFreeColClient().getGUI().getFixedImageLibrary().scale(new Dimension(1280, 700));
getGUI().restoreSavedSize(this, startingSize);
setEscapeAction(new AbstractAction() {
@ -466,6 +458,17 @@ public final class ColonyPanel extends PortPanel
});
}
/**
* {@inheritDoc}
*/
@Override
public void refreshLayout() {
final Colony theColony = colony;
closeColonyPanel();
getGUI().showColonyPanel(theColony, null);
}
/**
* Paints parts of the background/skins for the ColonyPanel. In the future
* we will probably want to generalize this approach in order to allow
@ -587,18 +590,10 @@ public final class ColonyPanel extends PortPanel
/**
* Initialize the entire panel.
*
* We can arrive here normally when a colony panel is created,
* or when an existing colony panel is changed via the colony name
* menu in the nameBox.
*
* @param colony The {@code Colony} to be displayed.
*/
private void initialize(Colony colony) {
private void initialize() {
cleanup();
setColony(colony);
addPropertyChangeListeners();
addMouseListeners();
setTransferHandlers(isEditable());
@ -655,7 +650,7 @@ public final class ColonyPanel extends PortPanel
JPanel upperRightPanel = new JPanel(new MigLayout("wrap 1", "[center]"));
upperRightPanel.setOpaque(false);
upperRightPanel.add(tilesPanel, "width " + tilesScrollDimension.width + "px!, height " + tilesScrollDimension.height +"px!, top, center");
final FreeColImageBorder border = FreeColImageBorder.innerColonyPanelBorder;
final Insets borderInsets = border.getBorderInsets(this);
upperRightPanel.add(netProductionPanel, "grow");
@ -663,9 +658,6 @@ public final class ColonyPanel extends PortPanel
// TODO: Display the numbers in new components:
//add(populationPanel, "grow");
final JPanel buttonPanel = new JPanel(new MigLayout("fill, wrap 1, gap 0 0, ins 0", "", ""));
buttonPanel.setOpaque(false);
/*
* TODO: Don't think we need these, but they can be added to the
* in-port panel if we do.
@ -673,28 +665,34 @@ public final class ColonyPanel extends PortPanel
//buttonPanel.add(unloadButton);
//buttonPanel.add(fillButton);
buttonPanel.add(buildQueueButton, "sg");
buttonPanel.add(warehouseButton, "sg");
buttonPanel.add(colonyUnitsButton, "sg");
upperRightPanel.add(buttonPanel, "sgy, split 2, left");
upperRightPanel.add(constructionPanel, "sgy, grow, top");
add(upperRightPanel, "span 1 3, grow, gapbefore 53, width 400!");
upperRightPanel.add(constructionPanel, "grow, top, wmax 350, height 100");
add(upperRightPanel, "span 1 3, growy, gapbefore 53, width 400!");
add(inPortScroll, "span, grow, height 96!, gaptop push");
add(outsideColonyScroll, "grow, height 96!");
add(cargoScroll, "grow, height 100!");
add(warehouseScroll, "span, split, height 48!, growx");
add(wrapWithBorder(warehouseButton), "height 48!, gap 0 0 0 0");
if (setGoodsButton != null) {
add(setGoodsButton, "height 48!, gap 0 0 0 0");
add(wrapWithBorder(setGoodsButton), "height 48!, gap 0 0 0 0");
}
if (traceWorkButton != null) {
add(traceWorkButton, "height 48!, gap 0 0 0 0");
add(wrapWithBorder(traceWorkButton), "height 48!, gap 0 0 0 0");
}
add(okButton, "gapbefore push, height 48!"); // tag ok
update();
}
private JPanel wrapWithBorder(JComponent c) {
final JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(FreeColImageBorder.woodenPanelBorder);
panel.add(c);
return panel;
}
/**
* Clean up this colony panel.

2
src/net/sf/freecol/client/gui/panel/FreeColImageBorder.java
View File

@ -49,6 +49,8 @@ public class FreeColImageBorder extends AbstractBorder {
public static final FreeColImageBorder buttonBorder = new FreeColImageBorder("image.border.button");
public static final FreeColImageBorder simpleButtonBorder = new FreeColImageBorder("image.border.button.simple");
public static final FreeColImageBorder menuBarBorder = new FreeColImageBorder("image.border.menu");
public static final FreeColImageBorder woodenPanelBorder = new FreeColImageBorder("image.border.wooden");
public static final FreeColImageBorder colonyWarehouseBorder = new FreeColImageBorder("image.border.colonyWarehouse");
public static final FreeColImageBorder colonyPanelBorder = new FreeColImageBorder("image.border.colony.panel");
public static final FreeColImageBorder innerColonyPanelBorder = new FreeColImageBorder("image.border.colony.panel.inner");

10
src/net/sf/freecol/client/gui/panel/FreeColPanel.java
View File

@ -278,7 +278,15 @@ public abstract class FreeColPanel extends MigPanel implements ActionListener {
public Border getFrameBorder() {
return null;
}
/**
* Refreshes the layout after scaling and/or font changes.
*
* Subclasses can extend this method to handle the change.
*/
public void refreshLayout() {
}
// Interface ActionListener