summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-05 21:56:45 +0000
committerglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-05 21:56:45 +0000
commit852a9f6aa1aa1c8eef2ae0e4366b46bc3c13649f (patch)
treedd9a85b27e5b9a2cfcb79c8c9d4e6f1c5e3cd62d
parentd58f04ff58e9b30e4fc94b774c00bd4a4d1f90dc (diff)
downloadchromium_src-852a9f6aa1aa1c8eef2ae0e4366b46bc3c13649f.zip
chromium_src-852a9f6aa1aa1c8eef2ae0e4366b46bc3c13649f.tar.gz
chromium_src-852a9f6aa1aa1c8eef2ae0e4366b46bc3c13649f.tar.bz2
Left-align the distributor logo on RTL Vista while we wait for a properly flipped frame.
BUG=1308358 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@396 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/vista_frame.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/vista_frame.cc b/chrome/browser/vista_frame.cc
index 9d164ac..f326ed9 100644
--- a/chrome/browser/vista_frame.cc
+++ b/chrome/browser/vista_frame.cc
@@ -258,9 +258,17 @@ void VistaFrame::Layout() {
} else {
CSize distributor_logo_size;
distributor_logo_->GetPreferredSize(&distributor_logo_size);
+
+ int logo_x;
+ // Because of Bug 1128173, our Window controls aren't actually flipped
+ // on Vista, yet all our math and layout presumes that they are.
+ if (frame_view_->UILayoutIsRightToLeft())
+ logo_x = width - distributor_logo_size.cx;
+ else
+ logo_x = width - min_offset - distributor_logo_size.cx;
+
distributor_logo_->SetVisible(true);
- distributor_logo_->SetBounds(width - min_offset -
- distributor_logo_size.cx,
+ distributor_logo_->SetBounds(logo_x,
kDistributorLogoVerticalOffset,
distributor_logo_size.cx,
distributor_logo_size.cy);