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

Fixes unintended rendering differences between systems. 

There was a bug in the version of MigLayout we used, prior to this commit, that applied DPI scaling even when that option was disabled (we do our own DPI scaling) for default/logical pixels.
This commit is contained in:
Stian Grenborgen 2023-12-11 20:52:50 +01:00
parent 578502c434
commit 3221600148
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -28,9 +28,9 @@
value="${freecol.src.dir}/overview.html"/>
<property name="test" value="AllTests"/>
<property name="miglayout-swing.jar"
value="jars/miglayout-swing-5.0.jar"/>
value="jars/miglayout-swing-5.3.jar"/>
<property name="miglayout-core.jar"
value="jars/miglayout-core-5.0.jar"/>
value="jars/miglayout-core-5.3.jar"/>
<property name="cli.jar" value="jars/commons-cli-1.4.jar"/>
<property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>

BIN
jars/miglayout-core-5.0.jar
View File

Binary file not shown.

BIN
jars/miglayout-core-5.3.jar Normal file
View File

Binary file not shown.

BIN
jars/miglayout-swing-5.0.jar
View File

Binary file not shown.

BIN
jars/miglayout-swing-5.3.jar Normal file
View File

Binary file not shown.

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

@ -76,7 +76,7 @@ public class BuildingPanel extends MigPanel implements PropertyChangeListener {
* @param building The building to display information from.
*/
public BuildingPanel(FreeColClient freeColClient, Building building) {
super(new MigLayout("", "[16!][16!][16!]", "[16!][22!]"));
super(new MigLayout("", "[32!][32!][32!]", "[32!][44!]"));
this.freeColClient = freeColClient;
this.building = building;

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

@ -512,10 +512,10 @@ public final class ColonyPanel extends PortPanel
add(buildingsScroll, "span 1 3, grow");
add(populationPanel, "grow");
add(constructionPanel, "grow, top");
add(inPortScroll, "span, split 3, grow, sg, height 30:80:");
add(cargoScroll, "grow, sg, height 30:80:");
add(outsideColonyScroll, "grow, sg, height 30:80:");
add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height) + ":" + (ImageLibrary.ICON_SIZE.height) + ":" + (2*ImageLibrary.ICON_SIZE.height) + ", growx");
add(inPortScroll, "span, split 3, grow, sg, height 60:160:");
add(cargoScroll, "grow, sg, height 60:160:");
add(outsideColonyScroll, "grow, sg, height 60:160:");
add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height * 2) + "!, growx");
int buttonFields = 6;
if (setGoodsButton != null) buttonFields++;
if (traceWorkButton != null) buttonFields++;