Bug 489565: [HighDPI] Make sure internal calls to *InPixels methods don't break overridable API methods
Device#getClientArea()
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 bf6943f..9b830a3 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
@@ -396,12 +396,7 @@
* @see #getBounds
*/
public Rectangle getClientArea () {
- checkDevice ();
- return DPIUtil.autoScaleDown (getClientAreaInPixels ());
-}
-
-private Rectangle getClientAreaInPixels () {
- return getBoundsInPixels ();
+ return getBounds ();
}
/**
@@ -687,6 +682,10 @@
shellHandle = OS.gtk_window_new(OS.GTK_WINDOW_TOPLEVEL);
if (shellHandle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gtk_widget_realize(shellHandle);
+ int scaleFactor = OS.gdk_window_get_scale_factor(shellHandle);
+ System.out.println(scaleFactor);
+ scaleFactor = OS.gtk_widget_get_scale_factor(shellHandle);
+ System.out.println(scaleFactor);
/* Initialize the system font slot */
long /*int*/ defaultFont;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
index 4eaf49c..9685c5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
@@ -434,12 +434,7 @@
* @see #getBounds
*/
public Rectangle getClientArea () {
- checkDevice ();
- return DPIUtil.autoScaleDown(getClientAreaInPixels());
-}
-
-private Rectangle getClientAreaInPixels () {
- return getBoundsInPixels ();
+ return getBounds ();
}
/**
