summaryrefslogtreecommitdiffstats
path: root/views/window/custom_frame_view.cc
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 00:24:01 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 00:24:01 +0000
commita36366f796233d0678cf8d7ee47a52c4344530ed (patch)
tree7837e70b0c68173efa72a4417e6c6e69bf87325e /views/window/custom_frame_view.cc
parentf716760f7ef24e3e4ed3224df290dc90d6b9745f (diff)
downloadchromium_src-a36366f796233d0678cf8d7ee47a52c4344530ed.zip
chromium_src-a36366f796233d0678cf8d7ee47a52c4344530ed.tar.gz
chromium_src-a36366f796233d0678cf8d7ee47a52c4344530ed.tar.bz2
Fix dialog edges - error was because we made the top edges the same height but didn't update the code that compensated for their previously-different heights.
BUG=13812 Review URL: http://codereview.chromium.org/145017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/custom_frame_view.cc')
-rw-r--r--views/window/custom_frame_view.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index b5ef3ab9..3434485 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -422,11 +422,7 @@ void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
SkBitmap* left = rb.GetBitmapNamed(IDR_CONTENT_LEFT_SIDE);
// Top.
- // This next calculation is necessary because the top center bitmap is shorter
- // than the top left and right bitmaps. We need their top edges to line up,
- // and we need the left and right edges to start below the corners' bottoms.
int top_edge_y = client_area_top - top->height();
- client_area_top = top_edge_y + top_left->height();
canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
top_edge_y);
canvas->TileImageInt(*top, client_area_bounds.x(), top_edge_y,
@@ -454,8 +450,8 @@ void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
// Draw the toolbar color to fill in the edges.
canvas->DrawRectInt(ResourceBundle::toolbar_color,
- client_area_bounds.x() - 1, client_area_top - 2,
- client_area_bounds.width() + 1, client_area_bottom - client_area_top + 2);
+ client_area_bounds.x() - 1, client_area_top - 1,
+ client_area_bounds.width() + 1, client_area_bottom - client_area_top + 1);
}
void CustomFrameView::LayoutWindowControls() {