Skip to content

[Mac] Buttons with font sizes>23pt are not correctly rendered #3085 #3086

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
xpomul wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

[Mac] Buttons with font sizes>23pt are not correctly rendered #3085 #3086

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
11 changes: 11 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@ NSSize cellSizeForBounds (long id, long sel, NSRect cellFrame) {
size.height = Math.max(size.height, imageSize.height);
}

// Native buttons in Cocoa always render with a height of 24.0; a font size higher than 16pt is not reflected.
// Therefore, we adjust the button height manually, if a custom font with a size > 16 is set.
if (font != null && font.handle.pointSize() > 16.0) {
NSCell cell = new NSCell (id);
NSRect titleRect = cell.titleRectForBounds(cellFrame);
// For some reason, the titleRectForBounds() returns too small heights for font sizes > 20
// We fix this by adjusting the height by 8 which leads to nicer results for all sizes.
final int FONT_SIZE_HEIGHT_ADJUST = 8;
size.height = Math.max(size.height, titleRect.height + FONT_SIZE_HEIGHT_ADJUST);
}

if (((style & (SWT.PUSH|SWT.TOGGLE)) !=0) && (style & (SWT.FLAT|SWT.WRAP)) == 0) {
if (image != null) {
NSCell cell = new NSCell(id);
Expand Down
Loading