2016-03-17 Tim Horton <timothy_horton@apple.com>
+ Fix some deprecation warnings in WebEditingTester
+ https://bugs.webkit.org/show_bug.cgi?id=155601
+
+ Reviewed by Simon Fraser.
+
+ * WebEditingTester/AppDelegate.m:
+ (-[WebEditingAppDelegate showOperations:]):
+ (-[WebEditingAppDelegate _updateNewWindowKeyEquivalents]):
+
+2016-03-17 Tim Horton <timothy_horton@apple.com>
+
Find-in-page indicator in Mail viewer is the wrong scale and cut off
https://bugs.webkit.org/show_bug.cgi?id=155605
<rdar://problem/23948165>
static BOOL initialized = NO;
if (!initialized) {
- NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSMiniControlSize]];
+ NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeMini]];
NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
NSArray *operations = editingOperations();
}
NSButton *button = [[NSButton alloc] initWithFrame:NSMakeRect(x, y, maxWidth, 16)];
[button setBezelStyle:NSRoundedBezelStyle];
- [button.cell setControlSize:NSMiniControlSize];
+ [button.cell setControlSize:NSControlSizeMini];
[button setFont:font];
[button setTitle:operationName];
[button setAction:NSSelectorFromString(operationName)];
- (void)_updateNewWindowKeyEquivalents
{
if (self.useWebKit2ByDefault) {
- [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
- [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
} else {
- [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask];
- [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+ [_newWebKit1EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+ [_newWebKit2EditorItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
}
}