Fix dialog edges - error was because we made the top edges the same height bu...

views/window/custom_frame_view.cc

 // Copyright (c) 2009 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.
 
 #include "views/window/custom_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
@@ skipping 404 matching lines @@
   SkBitmap* top_right = rb.GetBitmapNamed(IDR_APP_TOP_RIGHT);
   SkBitmap* right = rb.GetBitmapNamed(IDR_CONTENT_RIGHT_SIDE);
   SkBitmap* bottom_right =
       rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom = rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_CENTER);
   SkBitmap* bottom_left =
       rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
   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,
                        client_area_bounds.width(), top->height());
   canvas->DrawBitmapInt(*top_right, client_area_bounds.right(), top_edge_y);
 
   // Right.
   int client_area_bottom =
       std::max(client_area_top, client_area_bounds.bottom());
   int client_area_height = client_area_bottom - client_area_top;
   canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
                        right->width(), client_area_height);
 
   // Bottom.
   canvas->DrawBitmapInt(*bottom_right, client_area_bounds.right(),
                         client_area_bottom);
   canvas->TileImageInt(*bottom, client_area_bounds.x(), client_area_bottom,
                        client_area_bounds.width(), bottom_right->height());
   canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
 
   // Left.
   canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
       client_area_top, left->width(), client_area_height);
 
   // 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() {
   close_button_->SetImageAlignment(ImageButton::ALIGN_LEFT,
                                    ImageButton::ALIGN_BOTTOM);
   // Maximized buttons start at window top so that even if their images aren't
   // drawn flush with the screen edge, they still obey Fitts' Law.
   bool is_maximized = frame_->IsMaximized();
   int frame_thickness = FrameBorderThickness();
   int caption_y = is_maximized ? frame_thickness : kCaptionTopSpacing;
@@ skipping 122 matching lines @@
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO: need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views