Allow the tiling of theme background images on the NTP....

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 544 matching lines @@
 }
 
 void BookmarkBarView::Paint(gfx::Canvas* canvas) {
   if (IsDetachedStyle()) {
     // Draw the background to match the new tab page.
     ThemeProvider* tp = GetThemeProvider();
     canvas->FillRectInt(
         tp->GetColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND),
         0, 0, width(), height());
 
-    int alignment;
-    if (tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT,
-                               &alignment)) {
-      if (alignment & BrowserThemeProvider::ALIGN_TOP) {
-        SkBitmap* ntp_background = tp->GetBitmapNamed(IDR_THEME_NTP_BACKGROUND);
+    if (tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
+      int tiling = BrowserThemeProvider::NO_REPEAT;
+      tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_TILING,
+                             &tiling);
+      int alignment;
+      if (tp->GetDisplayProperty(BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT,
+                                 &alignment)) {
+        SkBitmap* ntp_background = tp->GetBitmapNamed(
+            IDR_THEME_NTP_BACKGROUND);
 
-        if (alignment & BrowserThemeProvider::ALIGN_LEFT) {
-          canvas->DrawBitmapInt(*ntp_background, 0, 0);
-        } else if (alignment & BrowserThemeProvider::ALIGN_RIGHT) {
-          canvas->DrawBitmapInt(*ntp_background, width() -
-                                ntp_background->width(), 0);
+        if (alignment & BrowserThemeProvider::ALIGN_TOP) {
+          PaintThemeBackgroundTopAligned(
+              canvas, ntp_background, tiling, alignment);
         } else {
-          canvas->DrawBitmapInt(*ntp_background, width() / 2-
-                                ntp_background->width() / 2, 0);
+          PaintThemeBackgroundBottomAligned(
+              canvas, ntp_background, tiling, alignment);
         }
       }
     }
 
     // Draw the 'bottom' of the toolbar above our bubble.
     canvas->FillRectInt(ResourceBundle::toolbar_separator_color,
                         0, 0, width(), 1);
 
     SkRect rect;
 
@@ skipping 39 matching lines @@
 
     canvas->TileImageInt(*GetThemeProvider()->
         GetBitmapNamed(IDR_THEME_TOOLBAR),
         GetParent()->GetBounds(views::View::APPLY_MIRRORING_TRANSFORMATION).x()
         + bounds.x(), bounds.y(), 0, 0, width(), height());
     canvas->FillRectInt(ResourceBundle::toolbar_separator_color,
                         0, height() - 1, width(), 1);
   }
 }
 
+void BookmarkBarView::PaintThemeBackgroundTopAligned(gfx::Canvas* canvas,
+    SkBitmap* ntp_background, int tiling, int alignment) {
+
+  if (alignment & BrowserThemeProvider::ALIGN_LEFT) {
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, 0, 0, width(), height());
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, 0, 0, width(),
+                           ntp_background->height());
+    else
+      canvas->TileImageInt(*ntp_background, 0, 0,
+          ntp_background->width(), ntp_background->height());
+
+  } else if (alignment & BrowserThemeProvider::ALIGN_RIGHT) {
+    int x_pos = width() % ntp_background->width() - ntp_background->width();
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, x_pos, 0,
+          width() + ntp_background->width(), height());
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, x_pos,
+          0, width() + ntp_background->width(), ntp_background->height());
+    else
+      canvas->TileImageInt(*ntp_background, width() - ntp_background->width(),
+          0, ntp_background->width(), ntp_background->height());
+
+  } else {  // ALIGN == CENTER
+    int x_pos = width() > ntp_background->width() ?
+        ((width() / 2 - ntp_background->width() / 2) %
+        ntp_background->width()) - ntp_background->width() :
+        width() / 2 - ntp_background->width() / 2;
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, x_pos, 0,
+                           width() + ntp_background->width(), height());
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, x_pos, 0,
+                           width() + ntp_background->width(),
+                           ntp_background->height());
+    else
+      canvas->TileImageInt(*ntp_background,
+          width() / 2 - ntp_background->width() / 2,
+          0, ntp_background->width(), ntp_background->height());
+  }
+}
+
+void BookmarkBarView::PaintThemeBackgroundBottomAligned(gfx::Canvas* canvas,
+    SkBitmap* ntp_background, int tiling, int alignment) {
+  int browser_height = GetParent()->GetBounds(
+      views::View::APPLY_MIRRORING_TRANSFORMATION).height();
+  int border_width = 5;
+  int y_pos = ((tiling == BrowserThemeProvider::REPEAT_X) ||
+               (tiling == BrowserThemeProvider::NO_REPEAT)) ?
+      browser_height - ntp_background->height() - height() - border_width :
+      browser_height % ntp_background->height() - height() - border_width -
+          ntp_background->height();
+
+  if (alignment & BrowserThemeProvider::ALIGN_LEFT) {
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, 0, y_pos, width(),
+          2 * height() + ntp_background->height() + 5);
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, 0, y_pos, width(),
+          ntp_background->height());
+    else if (tiling == BrowserThemeProvider::REPEAT_Y)
+      canvas->TileImageInt(*ntp_background, 0, y_pos,
+          ntp_background->width(),
+          2 * height() + ntp_background->height() + 5);
+    else
+      canvas->TileImageInt(*ntp_background, 0, y_pos, ntp_background->width(),
+          ntp_background->height());
+
+  } else if (alignment & BrowserThemeProvider::ALIGN_RIGHT) {
+    int x_pos = width() % ntp_background->width() - ntp_background->width();
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, x_pos, y_pos,
+          width() + ntp_background->width(),
+          2 * height() + ntp_background->height() + 5);
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, x_pos, y_pos,
+          width() + ntp_background->width(), ntp_background->height());
+    else if (tiling == BrowserThemeProvider::REPEAT_Y)
+      canvas->TileImageInt(*ntp_background, width() - ntp_background->width(),
+          y_pos, ntp_background->width(),
+          2 * height() + ntp_background->height() + 5);
+    else
+      canvas->TileImageInt(*ntp_background, width() - ntp_background->width(),
+          y_pos, ntp_background->width(), ntp_background->height());
+
+  } else {  // ALIGN == CENTER
+    int x_pos = width() > ntp_background->width() ?
+        ((width() / 2 - ntp_background->width() / 2) %
+        ntp_background->width()) - ntp_background->width() :
+        width() / 2 - ntp_background->width() / 2;
+    if (tiling == BrowserThemeProvider::REPEAT)
+      canvas->TileImageInt(*ntp_background, x_pos, y_pos,
+          width() + ntp_background->width(),
+          2 * height() + ntp_background->height() + 5);
+    else if (tiling == BrowserThemeProvider::REPEAT_X)
+      canvas->TileImageInt(*ntp_background, x_pos, y_pos,
+          width() + ntp_background->width(), ntp_background->height());
+    else if (tiling == BrowserThemeProvider::REPEAT_Y)
+      canvas->TileImageInt(*ntp_background,
+          width() / 2 - ntp_background->width() / 2,
+          y_pos, ntp_background->width(),
+          2 * height() + ntp_background->height() + 5);
+    else
+      canvas->TileImageInt(*ntp_background,
+          width() / 2 - ntp_background->width() / 2,
+          y_pos, ntp_background->width(), ntp_background->height());
+  }
+}
+
 void BookmarkBarView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
 
   if (drop_info_.get() && drop_info_->valid &&
       drop_info_->drag_operation != 0 && drop_info_->drop_index != -1 &&
       !drop_info_->is_over_overflow && !drop_info_->drop_on) {
     int index = drop_info_->drop_index;
     DCHECK(index <= GetBookmarkButtonCount());
     int x = 0;
     int y = 0;
@@ skipping 928 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }