diff options
| -rw-r--r-- | chrome/app/nibs/en.lproj/MainMenu.xib | 31 | ||||
| -rw-r--r-- | chrome/renderer/renderer_main_platform_delegate_mac.mm | 37 |
2 files changed, 65 insertions, 3 deletions
diff --git a/chrome/app/nibs/en.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib index 29ddf9d..3eebfa0 100644 --- a/chrome/app/nibs/en.lproj/MainMenu.xib +++ b/chrome/app/nibs/en.lproj/MainMenu.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="57"/> + <integer value="296"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -750,6 +750,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">38001</int> </object> <object class="NSMenuItem" id="577314768"> <reference key="NSMenu" ref="466310130"/> @@ -759,6 +760,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">38002</int> </object> <object class="NSMenuItem" id="115970721"> <reference key="NSMenu" ref="466310130"/> @@ -768,6 +770,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">38003</int> </object> <object class="NSMenuItem" id="31790433"> <reference key="NSMenu" ref="466310130"/> @@ -1543,6 +1546,30 @@ </object> <int key="connectionID">554</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="115970721"/> + </object> + <int key="connectionID">555</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="577314768"/> + </object> + <int key="connectionID">556</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="407239884"/> + </object> + <int key="connectionID">557</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2882,7 +2909,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">554</int> + <int key="maxID">557</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/chrome/renderer/renderer_main_platform_delegate_mac.mm b/chrome/renderer/renderer_main_platform_delegate_mac.mm index 6754ec3..92f7242 100644 --- a/chrome/renderer/renderer_main_platform_delegate_mac.mm +++ b/chrome/renderer/renderer_main_platform_delegate_mac.mm @@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> #import <ApplicationServices/ApplicationServices.h> +#import <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> extern "C" { #include <sandbox.h> @@ -38,7 +39,8 @@ RendererMainPlatformDelegate::~RendererMainPlatformDelegate() { void SandboxWarmup() { base::ScopedNSAutoreleasePool scoped_pool; - { // CGColorSpaceCreateWithName(), CGBitmapContextCreate() - 10.5.6 + { // CGColorSpaceCreateWithName(), CGBitmapContextCreate(), + // scaled CoreUI controls - 10.5.6 CGColorSpaceRef rgb_colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); @@ -48,6 +50,39 @@ void SandboxWarmup() { rgb_colorspace, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); + + // Draw scaled controls - http://crbug.com/11325 . The scaled CoreUI + // controls seem to be cached somewhere, so if you change this and + // everything still seems to work, it's possible that you broke something + // and just didn't notice it yet. See bug for details. + CGContextScaleCTM(tmp, 1.1, 1.1); // Anything != 1.0 will do. + HIThemeButtonDrawInfo btnInfo = {0}; + CGRect rect = CGRectMake(0, 0, 1, 1); + + ThemeButtonKind buttonKinds[] = { + kThemePushButton, + kThemeCheckBox, + kThemeRadioButton + }; + + ThemeDrawState buttonStates[] = { + kThemeStateInactive, + kThemeStateActive, + kThemeStatePressed + }; + + for (size_t i = 0; i < arraysize(buttonKinds); ++i) { + btnInfo.kind = buttonKinds[i]; + for (size_t j = 0; j < arraysize(buttonKinds); ++j) { + btnInfo.state = buttonStates[j]; + HIThemeDrawButton(&rect, + &btnInfo, + tmp, + kHIThemeOrientationNormal, + NULL); + } + } + CGColorSpaceRelease(rgb_colorspace); CGContextRelease(tmp); } |