diff options
| author | Dirk Fauth | 2016-05-11 21:02:12 +0000 |
|---|---|---|
| committer | Dirk Fauth | 2016-05-11 21:02:12 +0000 |
| commit | 490d7fec5cd88a6fe4340e608380b3e7d7fa44a8 (patch) | |
| tree | 12396b2e8f43620b3f3a47de8bf1648d9a9720bc | |
| parent | 2b03a5599447315102c3b92801ea3a41a7daa79f (diff) | |
| download | org.eclipse.nebula.widgets.nattable-490d7fec5cd88a6fe4340e608380b3e7d7fa44a8.tar.gz org.eclipse.nebula.widgets.nattable-490d7fec5cd88a6fe4340e608380b3e7d7fa44a8.tar.xz org.eclipse.nebula.widgets.nattable-490d7fec5cd88a6fe4340e608380b3e7d7fa44a8.zip | |
Ensure to never scale below 96 dpi
Change-Id: I4cc2ccbabc8b2dfbfe76c9f47b2ffbf63fef3d03
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
2 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfigScalingTest.java b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfigScalingTest.java index 473b465f..2711cecf 100644 --- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfigScalingTest.java +++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfigScalingTest.java @@ -181,6 +181,7 @@ public class SizeConfigScalingTest { assertEquals(2.0f, GUIHelper.getDpiFactor(192), 0); assertEquals(2.5f, GUIHelper.getDpiFactor(240), 0); assertEquals(3.0f, GUIHelper.getDpiFactor(288), 0); + assertEquals(1.0f, GUIHelper.getDpiFactor(78), 0); } } diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/util/GUIHelper.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/util/GUIHelper.java index d5c9110c..a2eea0bf 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/util/GUIHelper.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/util/GUIHelper.java @@ -371,7 +371,8 @@ public class GUIHelper { * @return The factor for dpi scaling calculations. */ public static float getDpiFactor(int dpi) { - return Math.round((dpi / 96f) * 100) / 100f; + // never scale below 96 dpi + return Math.max(1.0f, Math.round((dpi / 96f) * 100) / 100f); } /** |