Rotated Images

ash/launcher/launcher_button.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 "ash/launcher/launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "grit/ash_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/image_view.h"
 
 namespace {
 
 // Size of the bar. This is along the opposite axis of the shelf. For example,
 // if the shelf is aligned horizontally then this is the height of the bar.
 const int kBarSize = 3;
 const int kBarSpacing = 5;
 const int kIconSize = 32;
 const int kHopSpacing = 2;
@@ skipping 322 matching lines @@
 bool LauncherButton::IsShelfHorizontal() const {
   return shelf_layout_manager_->IsHorizontalAlignment();
 }
 
 void LauncherButton::UpdateState() {
   if (state_ == STATE_NORMAL) {
     bar_->SetVisible(false);
   } else {
     int bar_id;
     if (state_ & STATE_ACTIVE) {
-      bar_id = shelf_layout_manager_->SelectValueForShelfAlignment(
-          IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_ACTIVE,
-          IDR_AURA_LAUNCHER_UNDERLINE_LEFT_ACTIVE,
-          IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_ACTIVE);
+      bar_id = IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE;
     } else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) {
-      bar_id = shelf_layout_manager_->SelectValueForShelfAlignment(
-          IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_HOVER,
-          IDR_AURA_LAUNCHER_UNDERLINE_LEFT_HOVER,
-          IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_HOVER);
+      bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER;
     } else {
-      bar_id = shelf_layout_manager_->SelectValueForShelfAlignment(
-          IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_RUNNING,
-          IDR_AURA_LAUNCHER_UNDERLINE_LEFT_RUNNING,
-          IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_RUNNING);
+      bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
     }
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    bar_->SetImage(rb.GetImageNamed(bar_id).ToImageSkia());
+    const gfx::ImageSkia* image = rb.GetImageNamed(bar_id).ToImageSkia();
+    if(SHELF_ALIGNMENT_BOTTOM == shelf_layout_manager_->GetAlignment())
+      bar_->SetImage(*image);
+    else
+      bar_->SetImage(gfx::ImageSkiaOperations::CreateRotatedImage(*image,
+          shelf_layout_manager_->SelectValueForShelfAlignment(
+              SkBitmapOperations::ROTATION_270_CW,
+              SkBitmapOperations::ROTATION_270_CW,
+              SkBitmapOperations::ROTATION_90_CW)));
     bar_->SetVisible(true);
   }
   bool rtl = base::i18n::IsRTL();
   bar_->SetHorizontalAlignment(
       shelf_layout_manager_->SelectValueForShelfAlignment(
           views::ImageView::CENTER,
           rtl ? views::ImageView::TRAILING : views::ImageView::LEADING,
           rtl ? views::ImageView::LEADING : views::ImageView::TRAILING));
   bar_->SetVerticalAlignment(
       shelf_layout_manager_->SelectValueForShelfAlignment(
@@ skipping 22 matching lines @@
 
   // Force bar to layout as alignment may have changed but not bounds.
   bar_->Layout();
   Layout();
   bar_->SchedulePaint();
   SchedulePaint();
 }
 
 }  // namespace internal
 }  // namespace ash