summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:30:54 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:30:54 +0000
commit8b4b861f8ef2456c2c643032d78a17f6261fd234 (patch)
tree6afc0701ed8fa179269ca43ef134511c608ca6ca /chrome
parent8fb3f37e462e595afc3e206a04ad446b039ad13d (diff)
downloadchromium_src-8b4b861f8ef2456c2c643032d78a17f6261fd234.zip
chromium_src-8b4b861f8ef2456c2c643032d78a17f6261fd234.tar.gz
chromium_src-8b4b861f8ef2456c2c643032d78a17f6261fd234.tar.bz2
Account for the distributor logo when sizing the title text bounds.
http://crbug.com/2711 Review URL: http://codereview.chromium.org/6387 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/frame/opaque_non_client_view.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc
index 02c102b..2260dc0 100644
--- a/chrome/browser/views/frame/opaque_non_client_view.cc
+++ b/chrome/browser/views/frame/opaque_non_client_view.cc
@@ -310,6 +310,9 @@ static const int kWindowIconTitleSpacing = 3;
// The distance between the top of the window and the title text when a
// title-bar is showing.
static const int kTitleTopOffset = 6;
+// The distance between the right edge of the title text bounding box and the
+// left edge of the distributor logo.
+static const int kTitleLogoSpacing = 5;
// The distance between the bottom of the title text and the TabStrip when a
// title-bar is showing.
static const int kTitleBottomSpacing = 6;
@@ -997,7 +1000,7 @@ void OpaqueNonClientView::LayoutTitleBar() {
// Size the title, if visible.
if (d->ShouldShowWindowTitle()) {
int spacing = d->ShouldShowWindowIcon() ? kWindowIconTitleSpacing : 0;
- int title_right = minimize_button_->x();
+ int title_right = logo_bounds_.x() - kTitleLogoSpacing;
int icon_right = icon_bounds_.right();
int title_left = icon_right + spacing;
title_bounds_.SetRect(title_left, kTitleTopOffset + top_offset,