Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2242)

Unified Diff: ash/system/user/tray_user.cc

Issue 9813020: Adjust uber tray spacing around avatar and draw avatar using rounded rectangle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/system/tray/system_tray.cc ('K') | « ash/system/user/tray_user.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index b8064c9e6223fd261ecfedc070a7d97f3dadbdc0..46cb2f5b8db1a9823448ce0afc95e08dbe73cb5f 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -9,10 +9,15 @@
#include "ash/system/tray/tray_constants.h"
#include "base/utf_string_conversions.h"
#include "grit/ash_strings.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkShader.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/size.h"
+#include "ui/gfx/skia_util.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/image_view.h"
@@ -28,7 +33,8 @@ const int kUserInfoHorizontalPadding = 14;
const int kUserInfoVerticalPadding = 10;
const int kUserInfoPaddingBetweenItems = 3;
-const int kUserIconSize = 32;
+const int kUserIconSize = 27;
+const int kUserIconCornerRadius = 2;
const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
@@ -260,6 +266,65 @@ class UserView : public views::View,
DISALLOW_COPY_AND_ASSIGN(UserView);
};
+// A custom image view with rounded edges.
+class RoundedImageView : public views::View {
+ public:
+ // Constructs a new rounded image view with rounded corners of radius
+ // |corner_radius|.
+ RoundedImageView(int corner_radius) : corner_radius_(corner_radius) {
Ben Goodger (Google) 2012/03/21 22:10:41 explicit
flackr 2012/03/21 23:19:05 Done.
+ }
+
+ virtual ~RoundedImageView() {
+ }
+
+ // Set the bitmap that should be displayed from a pointer. The pointer
+ // contents is copied in the receiver's bitmap.
+ void SetImage(const SkBitmap& bm) {
+ image_ = bm;
+ SetImageSize(gfx::Size(bm.width(), bm.height()));
+ }
+
+ // Set the desired image size.
+ void SetImageSize(const gfx::Size& image_size) {
+ image_size_ = image_size;
+ PreferredSizeChanged();
+ }
+
+ // Overridden from views::View.
+ virtual gfx::Size GetPreferredSize() OVERRIDE {
+ return image_size_;
+ }
+
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ View::OnPaint(canvas);
+ gfx::Rect image_bounds(image_size_);
+ const SkScalar kRadius = SkIntToScalar(corner_radius_);
+ SkPath path;
+ path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius, kRadius);
+
+ SkPaint paint;
+ SkShader* shader = SkShader::CreateBitmapShader(image_,
+ SkShader::kRepeat_TileMode,
+ SkShader::kRepeat_TileMode);
+ SkMatrix shader_scale;
+ shader_scale.setScale(SkFloatToScalar(
+ static_cast<float>(image_bounds.width()) / image_.width()),
+ SkFloatToScalar(static_cast<float>(
+ image_bounds.height()) / image_.height()));
+ shader->setLocalMatrix(shader_scale);
+
+ paint.setShader(shader);
+ paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
+ shader->unref();
+ canvas->sk_canvas()->drawPath(path, paint);
+ }
+
+ private:
+ SkBitmap image_;
+ gfx::Size image_size_;
+ int corner_radius_;
+};
Ben Goodger (Google) 2012/03/21 22:10:41 DISALLOW_COPY
flackr 2012/03/21 23:19:05 Done.
+
} // namespace tray
TrayUser::TrayUser() {
@@ -269,7 +334,7 @@ TrayUser::~TrayUser() {
}
views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
- avatar_.reset(new views::ImageView);
+ avatar_.reset(new tray::RoundedImageView(kUserIconCornerRadius));
if (status == user::LOGGED_IN_USER || status == user::LOGGED_IN_OWNER) {
avatar_->SetImage(
ash::Shell::GetInstance()->tray_delegate()->GetUserImage());
« ash/system/tray/system_tray.cc ('K') | « ash/system/user/tray_user.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698