Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-02-10 06:08:40 -0500
committerMarkus Keller2016-02-10 06:08:40 -0500
commit7c09ad04d6cb6523cccfb76938db05435fc59549 (patch)
tree9deb4ac8401ef9752da81eccc113a07ec6e35321
parent4432ce1ed9c6534bf4424cfa9a8625ea5a232dd7 (diff)
downloadeclipse.platform.swt-slakkimsetti/NeonhiDpiWork.tar.gz
eclipse.platform.swt-slakkimsetti/NeonhiDpiWork.tar.xz
eclipse.platform.swt-slakkimsetti/NeonhiDpiWork.zip
Bug 399786 comment 31: fixed getDeviceZoom()slakkimsetti/NeonhiDpiWork
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index e485fd614b..125ecc2e53 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -1012,14 +1012,9 @@ public int getDeviceZoom() {
byte[] buffer = new byte [len];
OS.memmove (buffer, keyArray, len);
String type = new String(Converter.mbcsToWcs(null, buffer));
- if (i == monitor) {
- int index = type.indexOf(",");
- String height = type.substring((index + 1), (type.length() - 1));
- fontHeight = Integer.valueOf(height.trim());
- OS.g_free(keyArray);
- OS.g_variant_unref(iterValue);
- break;
- }
+ int index = type.indexOf(",");
+ String height = type.substring((index + 1), (type.length() - 1));
+ fontHeight = Math.max(fontHeight, Integer.valueOf(height.trim()));
OS.g_free(keyArray);
OS.g_variant_unref(iterValue);
}

Back to the top