Skip to content

[Cocoa] Replacing usages of Display#getDPI from cocoa #2870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShahzaibIbrahim wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

[Cocoa] Replacing usages of Display#getDPI from cocoa #2870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public Point getDPI() {
}

Point getIndependentDPI() {
return super.getDPI();
return new Point(72, 72);
}

/**
Expand Down
10 changes: 6 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ public boolean equals(Object object) {
*/
public FontData[] getFontData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
final int DOTS_PER_INCH = 72;
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
Expand All @@ -258,8 +259,8 @@ public FontData[] getFontData() {
if ((traits & OS.NSBoldFontMask) != 0) style |= SWT.BOLD;
if ((extraTraits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
if ((extraTraits & OS.NSBoldFontMask) != 0) style |= SWT.BOLD;
Point dpi = device.dpi, screenDPI = device.getScreenDPI();
FontData data = new FontData(name, (float)handle.pointSize() * screenDPI.y / dpi.y, style);
Point dpi = device.dpi;
FontData data = new FontData(name, (float)handle.pointSize() * DOTS_PER_INCH / dpi.y, style);
data.nsName = nsName;
return new FontData[]{data};
} finally {
Expand Down Expand Up @@ -312,8 +313,9 @@ public int hashCode() {
void init(String name, float height, int style, String nsName) {
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 = 72;
Point dpi = device.dpi;
float size = height * dpi.y / DOTS_PER_INCH;
NSFont systemFont = NSFont.systemFontOfSize(size);
NSFont boldSystemFont = NSFont.boldSystemFontOfSize(size);
String systemFontName = systemFont.familyName().getString();
Expand Down
Loading