GTK Fixes

Author: shahzaib

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java

@@ -652,6 +652,7 @@ public boolean getWarnings () {
  * @see #create
  */
 protected void init () {
+	final int DOTS_PER_INCH = 96;
 	if (debug) {
 		if (xDisplay != 0) {
 			/* Create the warning and error callbacks */
@@ -734,10 +735,9 @@ protected void init () {
 		}
 	}
 	defaultFont = OS.pango_font_description_copy (defaultFont);
-	Point dpi = getDPI(), screenDPI = getScreenDPI();
-	if (dpi.y != screenDPI.y) {
+	if (this.dpi.y != DOTS_PER_INCH) {
 		int size = OS.pango_font_description_get_size(defaultFont);
-		OS.pango_font_description_set_size(defaultFont, size * dpi.y / screenDPI.y);
+		OS.pango_font_description_set_size(defaultFont, size * this.dpi.y / DOTS_PER_INCH);
 	}
 	systemFont = Font.gtk_new (this, defaultFont);
 

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java

@@ -184,15 +184,15 @@ public boolean equals(Object object) {
  */
 public FontData[] getFontData() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-
+	final int DOTS_PER_INCH = 96;
 	long family = OS.pango_font_description_get_family(handle);
 	int length = C.strlen(family);
 	byte[] buffer = new byte[length];
 	C.memmove(buffer, family, length);
 	String name = new String(Converter.mbcsToWcs(buffer));
 	float height = (float)OS.pango_font_description_get_size(handle) / OS.PANGO_SCALE;
-	Point dpi = device.dpi, screenDPI = device.getScreenDPI();
-	float size = height * screenDPI.y / dpi.y;
+	Point dpi = device.dpi;
+	float size = height * DOTS_PER_INCH / dpi.y;
 	int pangoStyle = OS.pango_font_description_get_style(handle);
 	int pangoWeight = OS.pango_font_description_get_weight(handle);
 	int style = SWT.NORMAL;
@@ -254,8 +254,9 @@ public int hashCode() {
 void init(String name, float height, int style, byte[] fontString) {
 	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	Point dpi = device.dpi, screenDPI = device.getScreenDPI();
-	float size = height * dpi.y / screenDPI.y;
+	final int DOTS_PER_INCH = 96;
+	Point dpi = device.dpi;
+	float size = height * dpi.y / DOTS_PER_INCH;
 	if (fontString != null) {
 		handle = OS.pango_font_description_from_string (fontString);
 		if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java

@@ -5043,7 +5043,8 @@ String debugInfoForIndex(long index) {
 }
 
 void dpiChanged(int newScaleFactor) {
-	DPIUtil.setDeviceZoom (DPIUtil.mapDPIToZoom(getDPI().x * newScaleFactor));
+	final int DOTS_PER_INCH = 96;
+	DPIUtil.setDeviceZoom (DPIUtil.mapDPIToZoom(DOTS_PER_INCH * newScaleFactor));
 	Shell[] shells = getShells();
 	for (int i = 0; i < shells.length; i++) {
 		shells[i].layout(true, true);

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug507020_WaylandIconsDoubleScaled.java

@@ -42,7 +42,7 @@ public static void main (String [] args) {
 		gridData.horizontalSpan = 2;
 		canvas.setLayoutData (gridData);
 
-		new Label (shell, SWT.NONE).setText ("5. 50x50 box\n(Display#getDPI(): " + display.getDPI().x + ")");
+		new Label(shell, SWT.NONE).setText("5. 50x50 box");
 		Label box= new Label (shell, SWT.NONE);
 		box.setBackground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
 		box.setLayoutData (new GridData (50, 50));