MacViews: Overlay Scrollbars with Show/Hide Animations

ui/views/controls/scroll_view.cc

 // Copyright (c) 2012 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 "ui/views/controls/scroll_view.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
-#include "ui/views/controls/scrollbar/native_scroll_bar.h"
+#include "ui/views/style/platform_style.h"
 #include "ui/views/widget/root_view.h"
 
 namespace views {
 
 const char ScrollView::kViewClassName[] = "ScrollView";
 
 namespace {
 
 // Subclass of ScrollView that resets the border when the theme changes.
 class ScrollViewWithBorder : public views::ScrollView {
@@ skipping 93 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Viewport);
 };
 
 ScrollView::ScrollView()
     : contents_(NULL),
       contents_viewport_(new Viewport()),
       header_(NULL),
       header_viewport_(new Viewport()),
-      horiz_sb_(new NativeScrollBar(true)),
-      vert_sb_(new NativeScrollBar(false)),
+      horiz_sb_(PlatformStyle::CreateScrollBar(true).release()),
+      vert_sb_(PlatformStyle::CreateScrollBar(false).release()),
       corner_view_(new ScrollCornerView()),
       min_height_(-1),
       max_height_(-1),
       hide_horizontal_scrollbar_(false) {
   set_notify_enter_exit_on_child(true);
 
   AddChildView(contents_viewport_);
   AddChildView(header_viewport_);
 
   // Don't add the scrollbars as children until we discover we need them
@@ skipping 154 matching lines @@
     viewport_bounds.set_height(
         std::max(0, viewport_bounds.height() - horiz_sb_height));
     should_layout_contents = true;
   }
   // Default.
   if (!vert_sb_required) {
     viewport_bounds.set_width(viewport_bounds.width() + vert_sb_width);
     should_layout_contents = true;
   }
 
+  int height_offset = horiz_sb_required ?
+      horiz_sb_->GetContentOverlapSize() : 0;
+  int width_offset = vert_sb_required ?
+      vert_sb_->GetContentOverlapSize() : 0;
+
   if (horiz_sb_required) {
-    int height_offset = horiz_sb_->GetContentOverlapSize();
     horiz_sb_->SetBounds(contents_x,
                          viewport_bounds.bottom() - height_offset,
-                         viewport_bounds.right() - contents_x,
+                         viewport_bounds.right() - contents_x - width_offset,
                          horiz_sb_height + height_offset);
   }
   if (vert_sb_required) {
     int width_offset = vert_sb_->GetContentOverlapSize();
     vert_sb_->SetBounds(viewport_bounds.right() - width_offset,
                         contents_y,
                         vert_sb_width + width_offset,
-                        viewport_bounds.bottom() - contents_y);
+                        viewport_bounds.bottom() - contents_y - height_offset);
   }
   if (corner_view_required) {
     // Show the resize corner.
     corner_view_->SetBounds(vert_sb_->bounds().x(), horiz_sb_->bounds().y(),
                             vert_sb_width, horiz_sb_height);
   }
 
   // Update to the real client size with the visible scrollbars.
   contents_viewport_->SetBoundsRect(viewport_bounds);
   if (should_layout_contents && contents_)
@@ skipping 306 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views