diff --git a/.gitignore b/.gitignore index 47b9751..651be33 100755 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ *.versionsBackup *.cmd .mvn -mvnw \ No newline at end of file +mvnw +/.idea/ \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 50d3770..69e29ff 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml miglayout-core diff --git a/core/src/main/java/net/miginfocom/layout/PlatformDefaults.java b/core/src/main/java/net/miginfocom/layout/PlatformDefaults.java index 6b896f5..53a38b6 100755 --- a/core/src/main/java/net/miginfocom/layout/PlatformDefaults.java +++ b/core/src/main/java/net/miginfocom/layout/PlatformDefaults.java @@ -56,29 +56,29 @@ public final class PlatformDefaults private static volatile int MOD_COUNT = 0; // private static final UnitValue LPX1 = new UnitValue(1, UnitValue.LPX, null); -// private static final UnitValue LPX4 = new UnitValue(4, UnitValue.LPX, null); + private static final UnitValue LPX4 = new UnitValue(4, UnitValue.LPX, null); private static final UnitValue LPX6 = new UnitValue(6, UnitValue.LPX, null); private static final UnitValue LPX7 = new UnitValue(7, UnitValue.LPX, null); // private static final UnitValue LPX8 = new UnitValue(8, UnitValue.LPX, null); -// private static final UnitValue LPX9 = new UnitValue(9, UnitValue.LPX, null); + private static final UnitValue LPX9 = new UnitValue(9, UnitValue.LPX, null); // private static final UnitValue LPX10 = new UnitValue(10, UnitValue.LPX, null); private static final UnitValue LPX11 = new UnitValue(11, UnitValue.LPX, null); private static final UnitValue LPX12 = new UnitValue(12, UnitValue.LPX, null); -// private static final UnitValue LPX14 = new UnitValue(14, UnitValue.LPX, null); + private static final UnitValue LPX14 = new UnitValue(14, UnitValue.LPX, null); private static final UnitValue LPX16 = new UnitValue(16, UnitValue.LPX, null); private static final UnitValue LPX18 = new UnitValue(18, UnitValue.LPX, null); private static final UnitValue LPX20 = new UnitValue(20, UnitValue.LPX, null); // private static final UnitValue LPY1 = new UnitValue(1, UnitValue.LPY, null); -// private static final UnitValue LPY4 = new UnitValue(4, UnitValue.LPY, null); + private static final UnitValue LPY4 = new UnitValue(4, UnitValue.LPY, null); private static final UnitValue LPY6 = new UnitValue(6, UnitValue.LPY, null); private static final UnitValue LPY7 = new UnitValue(7, UnitValue.LPY, null); // private static final UnitValue LPY8 = new UnitValue(8, UnitValue.LPY, null); -// private static final UnitValue LPY9 = new UnitValue(9, UnitValue.LPY, null); + private static final UnitValue LPY9 = new UnitValue(9, UnitValue.LPY, null); // private static final UnitValue LPY10 = new UnitValue(10, UnitValue.LPY, null); private static final UnitValue LPY11 = new UnitValue(11, UnitValue.LPY, null); private static final UnitValue LPY12 = new UnitValue(12, UnitValue.LPY, null); -// private static final UnitValue LPY14 = new UnitValue(14, UnitValue.LPY, null); + private static final UnitValue LPY14 = new UnitValue(14, UnitValue.LPY, null); private static final UnitValue LPY16 = new UnitValue(16, UnitValue.LPY, null); private static final UnitValue LPY18 = new UnitValue(18, UnitValue.LPY, null); private static final UnitValue LPY20 = new UnitValue(20, UnitValue.LPY, null); @@ -177,11 +177,11 @@ public static void setPlatform(int plaf) switch (plaf) { case WINDOWS_XP: setDefaultVisualPadding("TabbedPane." + VISUAL_PADDING_PROPERTY, new int[]{1, 0, 1, 2}); - setRelatedGap(LPX7, LPY7); - setUnrelatedGap(LPX11, LPY11); - setParagraphGap(LPX20, LPY20); - setIndentGap(LPX11, LPY11); - setGridCellGap(LPX7, LPY7); + setRelatedGap(LPX4, LPY4); + setUnrelatedGap(LPX7, LPY9); + setParagraphGap(LPX14, LPY14); + setIndentGap(LPX9, LPY9); + setGridCellGap(LPX4, LPY4); setMinimumButtonWidth(new UnitValue(75, UnitValue.LPX, null)); setButtonOrder("L_E+U+YNBXOCAH_I_R"); diff --git a/demo/pom.xml b/demo/pom.xml index 028ad90..02dc054 100755 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -1,60 +1,60 @@ - - - 4.0.0 - - com.miglayout - miglayout-parent - 5.3 - ../pom.xml - - miglayout-demo - jar - MiGLayout Demo - MiGLayout - Demo's for Swing and SWT - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - true - lines,vars - - - - - - - - ${project.groupId} - miglayout-swing - ${project.version} - - - ${project.groupId} - miglayout-swt - ${project.version} - - - ${project.groupId} - miglayout-javafx - ${project.version} - - - ${project.groupId} - miglayout-ideutil - ${project.version} - - - org.java.net.substance - substance - 5.3 - true - - - + + + 4.0.0 + + com.miglayout + miglayout-parent + 5.3-patch2 + ../pom.xml + + miglayout-demo + jar + MiGLayout Demo + MiGLayout - Demo's for Swing and SWT + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + true + lines,vars,source + + + + + + + + ${project.groupId} + miglayout-swing + ${project.version} + + + ${project.groupId} + miglayout-swt + ${project.version} + + + ${project.groupId} + miglayout-javafx + ${project.version} + + + ${project.groupId} + miglayout-ideutil + ${project.version} + + + org.java.net.substance + substance + 5.3 + true + + + diff --git a/examples/pom.xml b/examples/pom.xml index 0a4d47c..6b3c3a5 100755 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml miglayout-examples diff --git a/ideutil/pom.xml b/ideutil/pom.xml index 90fb6e7..4002c3e 100755 --- a/ideutil/pom.xml +++ b/ideutil/pom.xml @@ -4,7 +4,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml miglayout-ideutil diff --git a/javafx/pom.xml b/javafx/pom.xml index 89f7a55..d9b5367 100755 --- a/javafx/pom.xml +++ b/javafx/pom.xml @@ -1,113 +1,113 @@ - - - 4.0.0 - - com.miglayout - miglayout-parent - 5.3 - ../pom.xml - - miglayout-javafx - jar - MiGLayout JavaFX - MiGLayout - Layout Manager for JavaFX - - - - ${project.groupId} - miglayout-core - ${project.version} - - - - org.testfx - testfx-core - 4.0.15-alpha - test - - - org.testfx - testfx-junit - 4.0.15-alpha - test - - - junit - junit - - - - - org.jfxtras - jfxtras-test-support - 8.0-r6 - test - - - org.jfxtras - jfxtras-font-roboto - 8.0-r6 - test - - - org.jfxtras - jfxtras-common - 8.0-r6 - test - - - org.testfx - testfx-core - - - org.testfx - testfx-junit - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - true - lines,vars - - - - - - - - - - - - - - - - - - - - - - tbee - Tom Eugelink - tbee@tbee.org - - Developer - - +1 - http://www.tbee.org/ - - - + + + 4.0.0 + + com.miglayout + miglayout-parent + 5.3-patch2 + ../pom.xml + + miglayout-javafx + jar + MiGLayout JavaFX + MiGLayout - Layout Manager for JavaFX + + + + ${project.groupId} + miglayout-core + ${project.version} + + + + org.testfx + testfx-core + 4.0.15-alpha + test + + + org.testfx + testfx-junit + 4.0.15-alpha + test + + + junit + junit + + + + + org.jfxtras + jfxtras-test-support + 8.0-r6 + test + + + org.jfxtras + jfxtras-font-roboto + 8.0-r6 + test + + + org.jfxtras + jfxtras-common + 8.0-r6 + test + + + org.testfx + testfx-core + + + org.testfx + testfx-junit + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + true + lines,vars,source + + + + + + + + + + + + + + + + + + + + + + tbee + Tom Eugelink + tbee@tbee.org + + Developer + + +1 + http://www.tbee.org/ + + + diff --git a/nbm/pom.xml b/nbm/pom.xml index 538e6bf..f9905f4 100644 --- a/nbm/pom.xml +++ b/nbm/pom.xml @@ -5,7 +5,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml @@ -26,12 +26,9 @@ To create your own repository, use: nbm:populate-repository --> - netbeans - NetBeans - https://bits.netbeans.org/maven2/ - - false - + jenkinsci + Jenkins CI + https://repo.jenkins-ci.org/public/ diff --git a/pom.xml b/pom.xml index c8497fb..23f155b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,309 +1,309 @@ - - - 4.0.0 - - org.sonatype.oss - oss-parent - 7 - - com.miglayout - miglayout-parent - 5.3 - pom - MiGLayout - MiGLayout - Java Layout Manager for Swing, SWT and JavaFX - 2007 - http://www.miglayout.com/ - - - core - swing - swt - javafx - ideutil - demo - examples - nbm - - - - - junit - junit - 4.13.1 - test - - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - intellij-javadoc-fix - - - - maven-javadoc-plugin - 3.0.0 - - /usr/bin/javadoc - - - - - - - - doclint-java8-disable - - [1.8,) - - - -Xdoclint:none - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - true - lines,vars - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.8.1 - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - release - deploy - - - - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - org.apache.maven.plugins - maven-changes-plugin - - - - changes-report - - - - - - - - - - maven-jar-plugin - 2.3.1 - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.felix - maven-bundle-plugin - 2.5.3 - true - - - bundle-manifest - process-classes - - manifest - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - -Xdoclint:none - -Xdoclint:none - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - deploy - - sign - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - - BSD - http://www.debian.org/misc/bsd.license - repo - - - - - scm:git:https://github.com/mikaelgrev/miglayout.git - scm:git:https://github.com/mikaelgrev/miglayout.git - https://github.com/mikaelgrev/miglayout - - - - - mikaelgrev - Mikael Grev - mikael.grev@miginfocom.com - - Project Lead - - +1 - http://www.miglayout.com/ - - - - joeluckelman - Joel Uckelman - uckelman@nomic.net - - Developer - - +1 - http://www.nomic.net/ - - - - anavarro - Alexandre Navarro - navarroa@free.fr - - Developer - - +1 - http://javageek.free.fr/ - - - - tuomashuhtanen - Tuomas Huhtanen - unknown@foo.com - - Developer - - +1 - http://unknown.foo.com/ - - - - tbee - Tom Eugelink - tbee@tbee.org - - Developer - - +1 - http://www.tbee.org/ - - - - + + + 4.0.0 + + org.sonatype.oss + oss-parent + 7 + + com.miglayout + miglayout-parent + 5.3-patch2 + pom + MiGLayout + MiGLayout - Java Layout Manager for Swing, SWT and JavaFX + 2007 + http://www.miglayout.com/ + + + core + swing + swt + + ideutil + + examples + + + + + + junit + junit + 4.13.1 + test + + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + intellij-javadoc-fix + + + + maven-javadoc-plugin + 3.0.0 + + /usr/bin/javadoc + + + + + + + + doclint-java8-disable + + [1.8,) + + + -Xdoclint:none + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + true + lines,vars,source + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.8.1 + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + false + release + deploy + + + + + org.apache.maven.plugins + maven-site-plugin + 3.0 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + org.apache.maven.plugins + maven-changes-plugin + + + + changes-report + + + + + + + + + + maven-jar-plugin + 2.3.1 + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + bundle-manifest + process-classes + + manifest + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + -Xdoclint:none + -Xdoclint:none + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + deploy + + sign + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + + + + BSD + http://www.debian.org/misc/bsd.license + repo + + + + + scm:git:https://github.com/mikaelgrev/miglayout.git + scm:git:https://github.com/mikaelgrev/miglayout.git + https://github.com/mikaelgrev/miglayout + + + + + mikaelgrev + Mikael Grev + mikael.grev@miginfocom.com + + Project Lead + + +1 + http://www.miglayout.com/ + + + + joeluckelman + Joel Uckelman + uckelman@nomic.net + + Developer + + +1 + http://www.nomic.net/ + + + + anavarro + Alexandre Navarro + navarroa@free.fr + + Developer + + +1 + http://javageek.free.fr/ + + + + tuomashuhtanen + Tuomas Huhtanen + unknown@foo.com + + Developer + + +1 + http://unknown.foo.com/ + + + + tbee + Tom Eugelink + tbee@tbee.org + + Developer + + +1 + http://www.tbee.org/ + + + + diff --git a/swing/pom.xml b/swing/pom.xml index 4e804c8..963be33 100755 --- a/swing/pom.xml +++ b/swing/pom.xml @@ -4,7 +4,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml miglayout-swing diff --git a/swing/src/main/java/net/miginfocom/swing/SwingComponentWrapper.java b/swing/src/main/java/net/miginfocom/swing/SwingComponentWrapper.java index c54ab65..4c38034 100755 --- a/swing/src/main/java/net/miginfocom/swing/SwingComponentWrapper.java +++ b/swing/src/main/java/net/miginfocom/swing/SwingComponentWrapper.java @@ -78,19 +78,23 @@ public SwingComponentWrapper(Component c) @Override public final int getBaseline(int width, int height) { - int h = height; - int[] visPad = getVisualPadding(); - if (h < 0) { - h = c.getHeight(); - } else if (visPad != null) { - h = height + visPad[0] + visPad[2]; - } - int baseLine = c.getBaseline(Math.max(0, width < 0 ? c.getWidth() : width), Math.max(0, h)); - if (baseLine != -1 && visPad != null) - baseLine -= visPad[0]; - - return baseLine; - } + try { + int h = height; + int[] visPad = getVisualPadding(); + if (h < 0) { + h = c.getHeight(); + } else if (visPad != null) { + h = height + visPad[0] + visPad[2]; + } + int baseLine = c.getBaseline(Math.max(0, width < 0 ? c.getWidth() : width), Math.max(0, h)); + if (baseLine != -1 && visPad != null) + baseLine -= visPad[0]; + + return baseLine; + } catch (Exception e) { + return -1; + } + } @Override public final Object getComponent() diff --git a/swt/pom.xml b/swt/pom.xml index 50e0385..1a6b386 100755 --- a/swt/pom.xml +++ b/swt/pom.xml @@ -4,7 +4,7 @@ com.miglayout miglayout-parent - 5.3 + 5.3-patch2 ../pom.xml miglayout-swt