ash uber tray: Make the tray background rounded.

ash uber tray: Make the tray background rounded.

BUG=110130
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=125032

[Ben Goodger (Google), 2012-03-05 00:24:44]

can you send me a snap of what it looks like now?

-Ben

On Sun, Mar 4, 2012 at 2:47 PM, <sadrul@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> ash uber tray: Make the tray background rounded.
>
> BUG=110130
> TEST=none
>
>
> Please review this at
http://codereview.chromium.**org/9594011/<http://codereview.chromium.org/9594...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ash/system/tray/system_tray.cc
>  M ash/wm/shelf_layout_manager.cc
>
>
> Index: ash/system/tray/system_tray.cc
> diff --git a/ash/system/tray/system_tray.**cc
> b/ash/system/tray/system_tray.**cc
> index 89e421b56781c9715a17fc025ef822**74aa32b27c..**
> cef7f3525676a693dc6eacd3c752b2**21b4679a87 100644
> --- a/ash/system/tray/system_tray.**cc
> +++ b/ash/system/tray/system_tray.**cc
> @@ -18,6 +18,7 @@
>  #include "third_party/skia/include/**core/SkPaint.h"
>  #include "third_party/skia/include/**core/SkPath.h"
>  #include "ui/gfx/canvas.h"
> +#include "ui/gfx/skia_util.h"
>  #include "ui/views/border.h"
>  #include "ui/views/bubble/bubble_**delegate.h"
>  #include "ui/views/controls/label.h"
> @@ -38,6 +39,8 @@ const SkColor kLightColor = SkColorSetRGB(240, 240, 240);
>  const SkColor kBackgroundColor = SK_ColorWHITE;
>  const SkColor kShadowColor = SkColorSetARGB(25, 0, 0, 0);
>
> +const SkColor kTrayBackgroundColor = SkColorSetARGB(127, 0, 0, 0);
> +
>  class SystemTrayBubbleBackground : public views::Background {
>  public:
>   explicit SystemTrayBubbleBackground(**views::View* owner)
> @@ -194,6 +197,28 @@ class SystemTrayBubble : public
> views::BubbleDelegateView {
>   DISALLOW_COPY_AND_ASSIGN(**SystemTrayBubble);
>  };
>
> +class SystemTrayBackground : public views::Background {
> + public:
> +  SystemTrayBackground() {}
> +  virtual ~SystemTrayBackground() {}
> +
> + private:
> +  // Overrridden from views::Background.
> +  virtual void Paint(gfx::Canvas* canvas, views::View* view) const
> OVERRIDE {
> +    SkPaint paint;
> +    paint.setAntiAlias(true);
> +    paint.setStyle(SkPaint::kFill_**Style);
> +    paint.setColor(**kTrayBackgroundColor);
> +    SkPath path;
> +    gfx::Rect bounds(view->**GetContentsBounds());
> +    SkScalar radius = SkIntToScalar(4);
> +    path.addRoundRect(gfx::**RectToSkRect(bounds), radius, radius);
> +    canvas->GetSkCanvas()->**drawPath(path, paint);
> +  }
> +
> +  DISALLOW_COPY_AND_ASSIGN(**SystemTrayBackground);
> +};
> +
>  }  // namespace
>
>  namespace ash {
> @@ -203,8 +228,7 @@ SystemTray::SystemTray()
>       popup_(NULL) {
>   SetLayoutManager(new views::BoxLayout(views::**BoxLayout::kHorizontal,
>       5, 0, 3));
> -  set_background(views::**Background::**CreateSolidBackground(
> -      SkColorSetARGB(127, 0, 0, 0)));
> +  set_background(new SystemTrayBackground);
>  }
>
>  SystemTray::~SystemTray() {
> Index: ash/wm/shelf_layout_manager.cc
> diff --git a/ash/wm/shelf_layout_manager.**cc
> b/ash/wm/shelf_layout_manager.**cc
> index 266af8f50edf561e6ffdf919d6e11f**c71cf9acaa..**
> 6831246e41afb123bfae64effe1590**6b6da09522 100644
> --- a/ash/wm/shelf_layout_manager.**cc
> +++ b/ash/wm/shelf_layout_manager.**cc
> @@ -134,7 +134,7 @@ void ShelfLayoutManager::**CalculateTargetBounds(bool
> visible,
>   int y = available_bounds.bottom() - (visible ? max_height_ : 0);
>   gfx::Rect status_bounds(status_->**GetWindowScreenBounds());
>   target_bounds->status_bounds = gfx::Rect(
> -      available_bounds.right() - status_bounds.width(),
> +      available_bounds.right() - status_bounds.width() - 10,
>       y + (max_height_ - status_bounds.height()) / 2,
>       status_bounds.width(), status_bounds.height());
>   gfx::Rect launcher_bounds(launcher_->**GetWindowScreenBounds());
>
>
>

[sadrul, 2012-03-05 00:34:25]

On 2012/03/05 00:24:44, Ben Goodger (Google) wrote:
> can you send me a snap of what it looks like now?

http://www.corp.google.com/~sadrul/ubertray/current-mar04-round.png

> 
> -Ben
> 
> On Sun, Mar 4, 2012 at 2:47 PM, <mailto:sadrul@chromium.org> wrote:
> 
> > Reviewers: Ben Goodger (Google),
> >
> > Description:
> > ash uber tray: Make the tray background rounded.
> >
> > BUG=110130
> > TEST=none
> >
> >
> > Please review this at
>
http://codereview.chromium.**org/9594011/%3Chttp://codereview.chromium.org/95...>
> >
> > SVN Base:
>
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
> >
> > Affected files:
> >  M ash/system/tray/system_tray.cc
> >  M ash/wm/shelf_layout_manager.cc
> >
> >
> > Index: ash/system/tray/system_tray.cc
> > diff --git a/ash/system/tray/system_tray.**cc
> > b/ash/system/tray/system_tray.**cc
> > index 89e421b56781c9715a17fc025ef822**74aa32b27c..**
> > cef7f3525676a693dc6eacd3c752b2**21b4679a87 100644
> > --- a/ash/system/tray/system_tray.**cc
> > +++ b/ash/system/tray/system_tray.**cc
> > @@ -18,6 +18,7 @@
> >  #include "third_party/skia/include/**core/SkPaint.h"
> >  #include "third_party/skia/include/**core/SkPath.h"
> >  #include "ui/gfx/canvas.h"
> > +#include "ui/gfx/skia_util.h"
> >  #include "ui/views/border.h"
> >  #include "ui/views/bubble/bubble_**delegate.h"
> >  #include "ui/views/controls/label.h"
> > @@ -38,6 +39,8 @@ const SkColor kLightColor = SkColorSetRGB(240, 240, 240);
> >  const SkColor kBackgroundColor = SK_ColorWHITE;
> >  const SkColor kShadowColor = SkColorSetARGB(25, 0, 0, 0);
> >
> > +const SkColor kTrayBackgroundColor = SkColorSetARGB(127, 0, 0, 0);
> > +
> >  class SystemTrayBubbleBackground : public views::Background {
> >  public:
> >   explicit SystemTrayBubbleBackground(**views::View* owner)
> > @@ -194,6 +197,28 @@ class SystemTrayBubble : public
> > views::BubbleDelegateView {
> >   DISALLOW_COPY_AND_ASSIGN(**SystemTrayBubble);
> >  };
> >
> > +class SystemTrayBackground : public views::Background {
> > + public:
> > +  SystemTrayBackground() {}
> > +  virtual ~SystemTrayBackground() {}
> > +
> > + private:
> > +  // Overrridden from views::Background.
> > +  virtual void Paint(gfx::Canvas* canvas, views::View* view) const
> > OVERRIDE {
> > +    SkPaint paint;
> > +    paint.setAntiAlias(true);
> > +    paint.setStyle(SkPaint::kFill_**Style);
> > +    paint.setColor(**kTrayBackgroundColor);
> > +    SkPath path;
> > +    gfx::Rect bounds(view->**GetContentsBounds());
> > +    SkScalar radius = SkIntToScalar(4);
> > +    path.addRoundRect(gfx::**RectToSkRect(bounds), radius, radius);
> > +    canvas->GetSkCanvas()->**drawPath(path, paint);
> > +  }
> > +
> > +  DISALLOW_COPY_AND_ASSIGN(**SystemTrayBackground);
> > +};
> > +
> >  }  // namespace
> >
> >  namespace ash {
> > @@ -203,8 +228,7 @@ SystemTray::SystemTray()
> >       popup_(NULL) {
> >   SetLayoutManager(new views::BoxLayout(views::**BoxLayout::kHorizontal,
> >       5, 0, 3));
> > -  set_background(views::**Background::**CreateSolidBackground(
> > -      SkColorSetARGB(127, 0, 0, 0)));
> > +  set_background(new SystemTrayBackground);
> >  }
> >
> >  SystemTray::~SystemTray() {
> > Index: ash/wm/shelf_layout_manager.cc
> > diff --git a/ash/wm/shelf_layout_manager.**cc
> > b/ash/wm/shelf_layout_manager.**cc
> > index 266af8f50edf561e6ffdf919d6e11f**c71cf9acaa..**
> > 6831246e41afb123bfae64effe1590**6b6da09522 100644
> > --- a/ash/wm/shelf_layout_manager.**cc
> > +++ b/ash/wm/shelf_layout_manager.**cc
> > @@ -134,7 +134,7 @@ void ShelfLayoutManager::**CalculateTargetBounds(bool
> > visible,
> >   int y = available_bounds.bottom() - (visible ? max_height_ : 0);
> >   gfx::Rect status_bounds(status_->**GetWindowScreenBounds());
> >   target_bounds->status_bounds = gfx::Rect(
> > -      available_bounds.right() - status_bounds.width(),
> > +      available_bounds.right() - status_bounds.width() - 10,
> >       y + (max_height_ - status_bounds.height()) / 2,
> >       status_bounds.width(), status_bounds.height());
> >   gfx::Rect launcher_bounds(launcher_->**GetWindowScreenBounds());
> >
> >
> >

[Ben Goodger (Google), 2012-03-05 15:51:14]

http://codereview.chromium.org/9594011/diff/1/ash/wm/shelf_layout_manager.cc
File ash/wm/shelf_layout_manager.cc (right):

http://codereview.chromium.org/9594011/diff/1/ash/wm/shelf_layout_manager.cc#...
ash/wm/shelf_layout_manager.cc:137: available_bounds.right() -
status_bounds.width() - 10,
- what?

[sadrul, 2012-03-05 22:47:16]

I also made a change to change the background color on hover. Please take
another look.

http://codereview.chromium.org/9594011/diff/1/ash/wm/shelf_layout_manager.cc
File ash/wm/shelf_layout_manager.cc (right):

http://codereview.chromium.org/9594011/diff/1/ash/wm/shelf_layout_manager.cc#...
ash/wm/shelf_layout_manager.cc:137: available_bounds.right() -
status_bounds.width() - 10,
On 2012/03/05 15:51:14, Ben Goodger (Google) wrote:
> - what?

Using a const kVariable so it's easier to understand what this is.

[Ben Goodger (Google), 2012-03-05 22:54:37]

lgtm

http://codereview.chromium.org/9594011/diff/6/ash/system/tray/system_tray.cc
File ash/system/tray/system_tray.cc (right):

http://codereview.chromium.org/9594011/diff/6/ash/system/tray/system_tray.cc#...
ash/system/tray/system_tray.cc:244: // Overrridden from views::Background.
2 rs

[sadrul, 2012-03-05 22:58:43]

http://codereview.chromium.org/9594011/diff/6/ash/system/tray/system_tray.cc
File ash/system/tray/system_tray.cc (right):

http://codereview.chromium.org/9594011/diff/6/ash/system/tray/system_tray.cc#...
ash/system/tray/system_tray.cc:244: // Overrridden from views::Background.
On 2012/03/05 22:54:37, Ben Goodger (Google) wrote:
> 2 rs

Done.