Fix resolution independence in theming. Improve from "pretty broken" to "brok...

chrome/browser/cocoa/browser_frame_view.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/browser_frame_view.h"
 
 #import <objc/runtime.h>
 #import <Carbon/Carbon.h>
 
 #include "base/logging.h"
@@ skipping 112 matching lines @@
 
   // WARNING: There is an obvious optimization opportunity here that you DO NOT
   // want to take. To save painting cycles, you might think it would be a good
   // idea to call out to -drawRectOriginal: only if no theme were drawn. In
   // reality, however, if you fail to call -drawRectOriginal:, or if you call it
   // after a clipping path is set, the rounded corners at the top of the window
   // will not draw properly. Do not try to be smart here.
 
   // Only paint the top of the window.
   NSWindow* window = [self window];
-  NSRect windowRect = [window frame];
+  NSRect windowRect = [self convertRect:[window frame] fromView:nil];
   windowRect.origin = NSMakePoint(0, 0);
 
   NSRect paintRect = windowRect;
   paintRect.origin.y = NSMaxY(paintRect) - kBrowserFrameViewPaintHeight;
   paintRect.size.height = kBrowserFrameViewPaintHeight;
   rect = NSIntersectionRect(paintRect, rect);
   [self drawRectOriginal:rect];
 
   // Set up our clip.
   float cornerRadius = 4.0;
@@ skipping 11 matching lines @@
 
   // If the window needs a title and we painted over the title as drawn by the
   // default window paint, paint it ourselves.
   if (themed && gCanDrawTitle && ![[self window] _isTitleHidden]) {
     [self _drawTitleStringIn:[self _titlebarTitleRect]
                    withColor:[BrowserFrameView titleColorForThemeView:self]];
   }
 
   // Pinstripe the top.
   if (themed) {
-    windowRect = [window frame];
+    NSSize windowPixel = [self convertSizeFromBase:NSMakeSize(1, 1)];
+
+    windowRect = [self convertRect:[window frame] fromView:nil];
     windowRect.origin = NSMakePoint(0, 0);
-    windowRect.origin.y -= 0.5;
-    windowRect.origin.x -= 0.5;
-    windowRect.size.width += 1.0;
+    windowRect.origin.y -= 0.5 * windowPixel.height;
+    windowRect.origin.x -= 0.5 * windowPixel.width;
+    windowRect.size.width += windowPixel.width;
     [[NSColor colorWithCalibratedWhite:1.0 alpha:0.5] set];
     NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:windowRect
                                                          xRadius:cornerRadius
                                                          yRadius:cornerRadius];
-    [path setLineWidth:1.0];
+    [path setLineWidth:windowPixel.width];
     [path stroke];
   }
 }
 
 + (BOOL)drawWindowThemeInDirtyRect:(NSRect)dirtyRect
                            forView:(NSView*)view
                             bounds:(NSRect)bounds {
   ThemeProvider* themeProvider = [[view window] themeProvider];
   if (!themeProvider)
     return NO;
@@ skipping 40 matching lines @@
     // patterns, we have to shift the pattern slightly, rather than simply
     // drawing it from the top left corner.  The offset below was empirically
     // determined in order to line these patterns up.
     //
     // This will make the themes look slightly different than in Windows/Linux
     // because of the differing heights between window top and tab top, but this
     // has been approved by UI.
     NSPoint phase = kBrowserFrameViewPatternPhaseOffset;
     phase.y += NSHeight(bounds);
 
-    phase = [view convertPoint:phase toView:nil];
+    // Align the phase to physical pixels so resizing the window under HiDPI
+    // doesn't cause wiggling of the theme.
+    phase = [view convertPointToBase:phase];
+    phase.x = floor(phase.x);
+    phase.y = floor(phase.y);
+    phase = [view convertPointFromBase:phase];

[Nico, 2010/03/11 23:38:32]

:-)

 
     [[NSGraphicsContext currentContext] setPatternPhase:phase];
     [themeImageColor set];
     NSRectFill(dirtyRect);
     themed = YES;
   } else if (gradient) {
     NSPoint startPoint = NSMakePoint(NSMinX(bounds), NSMaxY(bounds));
     NSPoint endPoint = startPoint;
     endPoint.y -= kBrowserFrameViewPaintHeight;
     [gradient drawFromPoint:startPoint toPoint:endPoint options:0];
@@ skipping 64 matching lines @@
 - (void)updateTrackingAreas {
   [super updateTrackingAreas];
   if ([[self window] isKindOfClass:[ChromeBrowserWindow class]]) {
     ChromeBrowserWindow* window =
         static_cast<ChromeBrowserWindow*>([self window]);
     [window updateTrackingAreas];
   }
 }
 
 @end