mirror of https://github.com/FreeCol/freecol.git
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:
parent
578502c434
commit
3221600148
|
@ -28,9 +28,9 @@
|
||||||
value="${freecol.src.dir}/overview.html"/>
|
value="${freecol.src.dir}/overview.html"/>
|
||||||
<property name="test" value="AllTests"/>
|
<property name="test" value="AllTests"/>
|
||||||
<property name="miglayout-swing.jar"
|
<property name="miglayout-swing.jar"
|
||||||
value="jars/miglayout-swing-5.0.jar"/>
|
value="jars/miglayout-swing-5.3.jar"/>
|
||||||
<property name="miglayout-core.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="cli.jar" value="jars/commons-cli-1.4.jar"/>
|
||||||
<property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>
|
<property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -76,7 +76,7 @@ public class BuildingPanel extends MigPanel implements PropertyChangeListener {
|
||||||
* @param building The building to display information from.
|
* @param building The building to display information from.
|
||||||
*/
|
*/
|
||||||
public BuildingPanel(FreeColClient freeColClient, Building building) {
|
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.freeColClient = freeColClient;
|
||||||
this.building = building;
|
this.building = building;
|
||||||
|
|
|
@ -512,10 +512,10 @@ public final class ColonyPanel extends PortPanel
|
||||||
add(buildingsScroll, "span 1 3, grow");
|
add(buildingsScroll, "span 1 3, grow");
|
||||||
add(populationPanel, "grow");
|
add(populationPanel, "grow");
|
||||||
add(constructionPanel, "grow, top");
|
add(constructionPanel, "grow, top");
|
||||||
add(inPortScroll, "span, split 3, grow, sg, height 30:80:");
|
add(inPortScroll, "span, split 3, grow, sg, height 60:160:");
|
||||||
add(cargoScroll, "grow, sg, height 30:80:");
|
add(cargoScroll, "grow, sg, height 60:160:");
|
||||||
add(outsideColonyScroll, "grow, sg, height 30:80:");
|
add(outsideColonyScroll, "grow, sg, height 60:160:");
|
||||||
add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height) + ":" + (ImageLibrary.ICON_SIZE.height) + ":" + (2*ImageLibrary.ICON_SIZE.height) + ", growx");
|
add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height * 2) + "!, growx");
|
||||||
int buttonFields = 6;
|
int buttonFields = 6;
|
||||||
if (setGoodsButton != null) buttonFields++;
|
if (setGoodsButton != null) buttonFields++;
|
||||||
if (traceWorkButton != null) buttonFields++;
|
if (traceWorkButton != null) buttonFields++;
|
||||||
|
|
Loading…
Reference in New Issue