diff options
| author | Alan Third | 2018-11-24 09:30:17 +0000 |
|---|---|---|
| committer | Alan Third | 2018-11-25 11:25:33 +0000 |
| commit | ea624626ccc2a108c3d6420d4f7ed3edae185425 (patch) | |
| tree | 897c2d6e4de1f1ea43c74628959138a402183ead /src | |
| parent | 094fcf62d289f19a4633275812e9e5e500463e91 (diff) | |
| download | emacs-ea624626ccc2a108c3d6420d4f7ed3edae185425.tar.gz emacs-ea624626ccc2a108c3d6420d4f7ed3edae185425.zip | |
Set tooltip text color (bug#33452)
; Do not merge into master
* src/nsmenu.m: ([EmacsTooltip init]): Set text color to black.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsmenu.m | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 604adcf40b5..52a7d52e8e0 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1318,8 +1318,9 @@ update_frame_tool_bar (struct frame *f) | |||
| 1318 | 1318 | ||
| 1319 | - (instancetype)init | 1319 | - (instancetype)init |
| 1320 | { | 1320 | { |
| 1321 | NSColor *col = [NSColor colorWithCalibratedRed: 1.0 green: 1.0 | 1321 | NSColor *bgcol = [NSColor colorWithCalibratedRed: 1.0 green: 1.0 |
| 1322 | blue: 0.792 alpha: 0.95]; | 1322 | blue: 0.792 alpha: 0.95]; |
| 1323 | NSColor *fgcol = [NSColor blackColor]; | ||
| 1323 | NSFont *font = [NSFont toolTipsFontOfSize: 0]; | 1324 | NSFont *font = [NSFont toolTipsFontOfSize: 0]; |
| 1324 | NSFont *sfont = [font screenFont]; | 1325 | NSFont *sfont = [font screenFont]; |
| 1325 | int height = [sfont ascender] - [sfont descender]; | 1326 | int height = [sfont ascender] - [sfont descender]; |
| @@ -1328,7 +1329,8 @@ update_frame_tool_bar (struct frame *f) | |||
| 1328 | 1329 | ||
| 1329 | textField = [[NSTextField alloc] initWithFrame: r]; | 1330 | textField = [[NSTextField alloc] initWithFrame: r]; |
| 1330 | [textField setFont: font]; | 1331 | [textField setFont: font]; |
| 1331 | [textField setBackgroundColor: col]; | 1332 | [textField setTextColor: fgcol]; |
| 1333 | [textField setBackgroundColor: bgcol]; | ||
| 1332 | 1334 | ||
| 1333 | [textField setEditable: NO]; | 1335 | [textField setEditable: NO]; |
| 1334 | [textField setSelectable: NO]; | 1336 | [textField setSelectable: NO]; |
| @@ -1345,7 +1347,7 @@ update_frame_tool_bar (struct frame *f) | |||
| 1345 | [win setReleasedWhenClosed: NO]; | 1347 | [win setReleasedWhenClosed: NO]; |
| 1346 | [win setDelegate: self]; | 1348 | [win setDelegate: self]; |
| 1347 | [[win contentView] addSubview: textField]; | 1349 | [[win contentView] addSubview: textField]; |
| 1348 | /* [win setBackgroundColor: col]; */ | 1350 | /* [win setBackgroundColor: bgcol]; */ |
| 1349 | [win setOpaque: NO]; | 1351 | [win setOpaque: NO]; |
| 1350 | 1352 | ||
| 1351 | return self; | 1353 | return self; |