diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 20:06:43 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 20:06:43 +0000 |
| commit | a7cbe92644ca480b348bc04813fffad1ea590e7a (patch) | |
| tree | d8fddf014397285e95275d17d4e5a52f46dd4c58 | |
| parent | 38e88f3014335a45061206368f3768382c99f766 (diff) | |
| download | chromium_src-a7cbe92644ca480b348bc04813fffad1ea590e7a.zip chromium_src-a7cbe92644ca480b348bc04813fffad1ea590e7a.tar.gz chromium_src-a7cbe92644ca480b348bc04813fffad1ea590e7a.tar.bz2 | |
Merge 54610 - Fixes bug where border highlight was drawn wrong for
increment/decrement button in wrench menu.
BUG=50959
TEST=see bug
Review URL: http://codereview.chromium.org/3056039
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/3038046
git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54801 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/wrench_menu.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/views/wrench_menu.cc b/chrome/browser/views/wrench_menu.cc index ae61b27..c46dc95 100644 --- a/chrome/browser/views/wrench_menu.cc +++ b/chrome/browser/views/wrench_menu.cc @@ -117,8 +117,13 @@ class MenuButtonBackground : public views::Background { // Used when the type is CENTER_BUTTON to determine if the left/right edge // needs to be rendered selected. void SetOtherButtons(CustomButton* left_button, CustomButton* right_button) { - left_button_ = left_button; - right_button_ = right_button; + if (base::i18n::IsRTL()) { + left_button_ = right_button; + right_button_ = left_button; + } else { + left_button_ = left_button; + right_button_ = right_button; + } } virtual void Paint(gfx::Canvas* canvas, View* view) const { @@ -374,7 +379,7 @@ class WrenchMenu::ZoomView : public ScheduleAllView, this, this, IDS_ZOOM_PLUS2, MenuButtonBackground::RIGHT_BUTTON, menu_model, increment_index, NULL); - center_bg->SetOtherButtons(increment_button_, decrement_button_); + center_bg->SetOtherButtons(decrement_button_, increment_button_); fullscreen_button_ = new FullscreenButton(this); fullscreen_button_->SetImage( |