Issue 107 - use a default DPI in case JavaFX reports 0

mikaelgrev · Aug 31, 2024 · 23ece50 · 23ece50
1 parent 06b7ba1
commit 23ece50
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-core</artifactId>
     <name>MiGLayout Core</name>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-demo</artifactId>
     <name>MiGLayout Demo</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-examples</artifactId>
     <name>MiGLayout Examples</name>

diff --git a/javafx/pom.xml b/javafx/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-javafx</artifactId>
     <name>MiGLayout JavaFX</name>

diff --git a/javafx/src/main/java/org/tbee/javafx/scene/layout/MigPane.java b/javafx/src/main/java/org/tbee/javafx/scene/layout/MigPane.java
@@ -972,14 +972,22 @@ public int[] getVisualPadding()
 		public int getHorizontalScreenDPI()
 		{
 			// todo All references to Screen.getPrimary() should be replaced with getting the actual screen the Node is on.
-			return (int) Math.ceil(Screen.getPrimary().getDpi());
+			double dpi = Screen.getPrimary().getDpi();
+			if (dpi < 1.0) {
+				dpi = 96.0;
+			}
+			return (int) Math.ceil(dpi);
 		}
 
 		@Override
 		public int getVerticalScreenDPI()
 		{
 			// todo All references to Screen.getPrimary() should be replaced with getting the actual screen the Node is on.
-			return (int) Math.ceil(Screen.getPrimary().getDpi());
+			double dpi = Screen.getPrimary().getDpi();
+			if (dpi < 1.0) {
+				dpi = 96.0;
+			}
+			return (int) Math.ceil(dpi);
 		}
 
 		@Override
@@ -1058,9 +1066,10 @@ public boolean equals(Object o)
 		@Override
 		public void setBounds(int x, int y, int width, int height)
 		{
-			//			System.out.println(getComponent() + " FXComponentWrapper.setBound x="  + x + ",y=" + y + " / w=" + width + ",h=" + height + " / resizable=" + this.node.isResizable());
-			//			System.out.println("x: " + x + ", y: " + y);
-			//			CC cc = wrapperToCCMap.get(this);
+// TBEERNOT
+System.out.println(getComponent() + " FXComponentWrapper.setBound x="  + x + ",y=" + y + " / w=" + width + ",h=" + height + " / resizable=" + this.node.isResizable());
+//System.out.println("x: " + x + ", y: " + y);
+//CC cc = wrapperToCCMap.get(this);
 
 			if (!animateBoundsChange(node, x, y, width, height)) {
 				node.resizeRelocate((double) x, (double) y, (double) width, (double) height);

diff --git a/nbm/pom.xml b/nbm/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 
     <artifactId>lib-miglayout-NB90</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>com.miglayout</groupId>
 	<artifactId>miglayout-parent</artifactId>
-	<version>11.4</version>
+	<version>11.4.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>MiGLayout</name>
 	<description>MiGLayout - Java Layout Manager for Swing, SWT and JavaFX</description>

diff --git a/swing/pom.xml b/swing/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-swing</artifactId>
     <name>MiGLayout Swing</name>

diff --git a/swt/pom.xml b/swt/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.miglayout</groupId>
 		<artifactId>miglayout-parent</artifactId>
-		<version>11.4</version>
+		<version>11.4.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>miglayout-swt</artifactId>
 	<name>MiGLayout SWT</name>