summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorculler <culler>2020-11-18 14:47:47 (GMT)
committerculler <culler>2020-11-18 14:47:47 (GMT)
commit611b219cbd36c037048c5cce30fd6b32474495cf (patch)
tree565bb244332ffd8320b776b0f614a30f34567a2b /macosx
parent517cab46b3a8d51a7a7c35be459168dadf549cd8 (diff)
downloadtk-611b219cbd36c037048c5cce30fd6b32474495cf.zip
tk-611b219cbd36c037048c5cce30fd6b32474495cf.tar.gz
tk-611b219cbd36c037048c5cce30fd6b32474495cf.tar.bz2
Test using an underline to indicate background color.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXMenu.c75
1 files changed, 40 insertions, 35 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index ee05eb5..e42ae3e 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -409,7 +409,7 @@ TKBackgroundLoop *backgroundLoop = nil;
(void)menu;
if (_tkMenu) {
- //RecursivelyClearActiveMenu(_tkMenu);
+ // RecursivelyClearActiveMenu(_tkMenu);
GenerateMenuSelectEvent((TKMenu *)[self supermenu],
[self itemInSupermenu]);
}
@@ -472,8 +472,8 @@ TKBackgroundLoop *backgroundLoop = nil;
}
backgroundLoop = [[TKBackgroundLoop alloc] init];
[backgroundLoop start];
- //TkMacOSXClearMenubarActive();
- //TkMacOSXPreprocessMenu();
+ // TkMacOSXClearMenubarActive();
+ // TkMacOSXPreprocessMenu();
}
- (void) menuEndTracking: (NSNotification *) notification
@@ -725,45 +725,49 @@ TkpConfigureMenuEntry(
[title substringToIndex:[title length] - 3], 0x2026];
}
}
- [menuItem setTitle:title];
- fontAttributes = TkMacOSXNSFontAttributesForFont(Tk_GetFontFromObj(
- mePtr->menuPtr->tkwin, fontPtr));
- attributes = [fontAttributes mutableCopy];
- if (gc->foreground != defaultFg) {
+ if ([title length]) {
+ fontAttributes = TkMacOSXNSFontAttributesForFont(Tk_GetFontFromObj(
+ mePtr->menuPtr->tkwin, fontPtr));
+ attributes = [fontAttributes mutableCopy];
+ if (gc->foreground != defaultFg) {
- /*
- * Apple's default foreground color changes to white when the menuitem is
- * selected. If a custom foreground color is used then the color will be
- * the same for selected and unselected menu items.
- */
+ /*
+ * Apple's default foreground color changes to white when the menuitem is
+ * selected. If a custom foreground color is used then the color will be
+ * the same for selected and unselected menu items.
+ */
- NSColor *fgcolor = TkMacOSXGetNSColor(gc, gc->foreground);
- [attributes setObject:fgcolor
- forKey:NSForegroundColorAttributeName];
- }
- if (gc->background != defaultBg) {
+ NSColor *fgcolor = TkMacOSXGetNSColor(gc, gc->foreground);
+ [attributes setObject:fgcolor
+ forKey:NSForegroundColorAttributeName];
+ }
+ if (gc->background != defaultBg) {
- /*
- * Setting a background color looks awful. But setting the background should
- * not be the same as setting the foreground. As a compromise, if the background
- * color is set we draw an underline in that color.
- */
- NSColor *bgcolor = TkMacOSXGetNSColor(gc, gc->background);
- [attributes setObject:bgcolor
- forKey:NSUnderlineColorAttributeName];
- [attributes setObject:[NSNumber numberWithInt:NSUnderlineStyleDouble]
- forKey:NSUnderlineStyleAttributeName];
+ /*
+ * Setting a background color looks awful. But setting the background should
+ * not be the same as setting the foreground. As a compromise, if the background
+ * color is set we draw an underline in that color.
+ */
+ NSColor *bgcolor = TkMacOSXGetNSColor(gc, gc->background);
+ [attributes setObject:bgcolor
+ forKey:NSUnderlineColorAttributeName];
+ [attributes setObject:[NSNumber numberWithInt:NSUnderlineStyleDouble]
+ forKey:NSUnderlineStyleAttributeName];
+ }
+ attributedTitle = [[NSAttributedString alloc]
+ initWithString:title
+ attributes:attributes];
+ [menuItem setAttributedTitle:attributedTitle];
}
- attributedTitle = [[[NSAttributedString alloc]
- initWithString:title attributes:attributes] autorelease];
- [menuItem setAttributedTitle:attributedTitle];
- [menuItem setEnabled:!(mePtr->state == ENTRY_DISABLED)];
+ fprintf(stderr, "Item %s has tk state %x apple enabled %d\n",
+ title.UTF8String, mePtr->state, [menuItem isEnabled]);
+ [menuItem setEnabled:(mePtr->state & ENTRY_DISABLED) == 0 || [title length] == 0];
[menuItem setState:((mePtr->type == CHECK_BUTTON_ENTRY ||
- mePtr->type == RADIO_BUTTON_ENTRY) && mePtr->indicatorOn &&
- (mePtr->entryFlags & ENTRY_SELECTED) ? NSOnState : NSOffState)];
+ mePtr->type == RADIO_BUTTON_ENTRY) && mePtr->indicatorOn &&
+ (mePtr->entryFlags & ENTRY_SELECTED) ? NSOnState : NSOffState)];
if (mePtr->type != CASCADE_ENTRY && mePtr->accelPtr && mePtr->accelLength) {
keyEquivalent = ParseAccelerator(Tcl_GetString(mePtr->accelPtr),
- &modifierMask);
+ &modifierMask);
}
[menuItem setKeyEquivalent:keyEquivalent];
[menuItem setKeyEquivalentModifierMask:modifierMask];
@@ -776,6 +780,7 @@ TkpConfigureMenuEntry(
CheckForSpecialMenu(menuRefPtr->menuPtr);
submenu = (TKMenu *) menuRefPtr->menuPtr->platformData;
if ([submenu supermenu] && [menuItem submenu] != submenu) {
+
/*
* This happens during a clone, where the parent menu is
* cloned before its children, so just ignore this temprary