diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 19:41:26 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 19:41:26 +0000 |
| commit | d376afe14ddabb7318fff20abca29b241e999858 (patch) | |
| tree | 9e9b53a7882aba5118e1fd205c545b48882eabb2 | |
| parent | c90d80a620d62d8d5e6b84fee7561834f4e53dd3 (diff) | |
| download | chromium_src-d376afe14ddabb7318fff20abca29b241e999858.zip chromium_src-d376afe14ddabb7318fff20abca29b241e999858.tar.gz chromium_src-d376afe14ddabb7318fff20abca29b241e999858.tar.bz2 | |
Cleaned up pixel alignment code.
BUG=132984
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10557009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142450 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_frame_view.mm | 12 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/nsview_additions.mm | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/ui/cocoa/browser_frame_view.mm b/chrome/browser/ui/cocoa/browser_frame_view.mm index 5f3e959..5d6b32e 100644 --- a/chrome/browser/ui/cocoa/browser_frame_view.mm +++ b/chrome/browser/ui/cocoa/browser_frame_view.mm @@ -12,6 +12,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #import "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/framed_browser_window.h" +#import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" @@ -148,18 +149,17 @@ static BOOL gCanGetCornerRadius = NO; // Pinstripe the top. if (themed) { - NSSize windowPixel = [self convertSizeFromBase:NSMakeSize(1, 1)]; - + CGFloat lineWidth = [self cr_lineWidth]; windowRect = [self convertRect:[window frame] fromView:nil]; windowRect.origin = NSMakePoint(0, 0); - windowRect.origin.y -= 0.5 * windowPixel.height; - windowRect.origin.x -= 0.5 * windowPixel.width; - windowRect.size.width += windowPixel.width; + windowRect.origin.y -= 0.5 * lineWidth; + windowRect.origin.x -= 0.5 * lineWidth; + windowRect.size.width += lineWidth; [[NSColor colorWithCalibratedWhite:1.0 alpha:0.5] set]; NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:windowRect xRadius:cornerRadius yRadius:cornerRadius]; - [path setLineWidth:windowPixel.width]; + [path setLineWidth:lineWidth]; [path stroke]; } } diff --git a/chrome/browser/ui/cocoa/nsview_additions.mm b/chrome/browser/ui/cocoa/nsview_additions.mm index 1eaf596..b97ef23 100644 --- a/chrome/browser/ui/cocoa/nsview_additions.mm +++ b/chrome/browser/ui/cocoa/nsview_additions.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,7 +7,9 @@ @implementation NSView (ChromeAdditions) - (CGFloat)cr_lineWidth { - return 1.0 / [self convertSizeToBase:NSMakeSize(1, 1)].width; + // NOTE: This is a correct use of base coordinate system, to perform pixel + // alignment. + return [self convertSizeFromBase:NSMakeSize(1, 1)].width; } - (BOOL)cr_isMouseInView { |